google_reg
add photo with google
edit user for social
twitter reg
add twitter and google logo
edit twitter add_email form
new google plus logo
fix twitter login
Merge branch 'omniauth_reg' into develop

Conflicts:
	app/controllers/devise/registrations_controller.rb
	app/controllers/users/omniauth_callbacks_controller.rb
	app/models/user.rb