Login with oAuth complete no icon
Merge branch 'oAuth2' into usersInHousehold

Conflicts:
	config/routes.rb

Users already registered with a oAuth can no longer create an account
manually. The reverse is still possible.