main_image drag a1
main_image drag completed
drag future articles a1
drag future article
mergerd
~~~
~~~
refactoring
~~~
~~~
~~~
~~~
~~~
future_text
~~
JODY_base
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