Merge branch 'master' into auth

Conflicts:
	Gemfile