Merge branch 'feature/next-steps' into feature/table-stiped

* feature/next-steps:
  next_steps

Conflicts:
	app/assets/stylesheets/groups.css.scss
	app/views/groups/_members.html.haml
	app/views/groups/show.html.haml
	config/locales/en.yml
	features/groups/edit_invitations.feature
	features/step_definitions/edit_invitations_step.rb