User Auth Token
Merge branch 'master' into feature/accept_emails

* master:
  User Auth Token

Conflicts:
	Gemfile