Merge remote-tracking branch 'origin/master' into rails_update_to_4_2

.rubocop.yml

CHANGELOG

Gemfile

Gemfile.lock

app/assets/stylesheets/framework/lists.scss

app/assets/stylesheets/framework/pagination.scss

app/assets/stylesheets/pages/groups.scss

app/models/project.rb

app/views/groups/group_members/_group_member.html.haml

app/views/groups/group_members/index.html.haml

app/views/projects/project_members/_group_members.html.haml

app/views/projects/project_members/_project_member.html.haml

app/views/projects/project_members/_team.html.haml

app/views/projects/project_members/index.html.haml

features/group/members.feature

features/group/milestones.feature

features/groups.feature

features/project/team_management.feature

features/steps/group/members.rb

features/steps/group/milestones.rb