Configuring omniauth
Merge branch 'feature/social_bugs_fix_79' into staging

Conflicts:
	app/views/web/sessions/_sign_in.html.haml
	app/views/web/users/new.html.haml