Fixed failing tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/fx-auth/user_profile.rb