36_social_nets_registration a1
add social buttons
get omniauth answer
some research for social reg
some research for social reg a1
~~~
Merge branch 'staging' into 36_social_nets_reg

* staging:
  JODY_base
  ~~
  future_text
  ~~~
  ~~~
  ~~~
  ~~~
  ~~~
  refactoring
  ~~~
  ~~~
  drag future article
  drag future articles a1
  main_image drag completed
  main_image drag a1

Conflicts:
	Gemfile.lock
	app/assets/javascripts/art_electronics/application.js
	app/assets/stylesheets/art_electronics/application.css
	config/routes.rb
gemfile
unstash
36_social_nets_registration a2
36_social_nets_registration a3
facebook auth b1
credential add depended :destroy
fix credential migration
twitter a1
disable email validation when oauth
create fake email, login for oauth
vk oauth
devise confirmable on a1
devise confirmable fix and send welcome mail