updated gems
Merge branch 'master' into feature/users_to_couples

Conflicts:
	Gemfile
	Gemfile.lock