format that shit
Merge branch 'chudix' into dev

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/backend/dashboard_controller.rb
	app/controllers/backend/posts_controller.rb
	app/views/backend/posts/index.html.erb
create galleries, images uploader
Merge branch 'dev' of github.com:farfanoide/agalma into dev
agregar imagenes a galaerias
agregar thumbs y muestra en galerias
Merge branch 'dev' into nestier

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/users_controller.rb