Merge remote-tracking branch 'origin/chudix' into nestier
creando galerias desde el post
antes del merge
Merge branch 'dev' into nestier
Merge branch 'dev' into nestier

Conflicts:
	app/controllers/backend/posts_controller.rb
	app/models/post.rb
creando galerias desde post, links rotos, policies post edit comentadas, sin helper para las nuevas galerias
Merge branch 'dev' into nestier
Merge branch 'dev' into nestier

Conflicts:
	app/controllers/backend/posts_controller.rb
nestier on the run
'para mergear'
galerias con noticias papa
form touches
Merge branch 'dev' into nestier
noticias en dashboard
updates home
Merge branch 'dev' of github.com:farfanoide/agalma into dev
updates seeds