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
adds mailer view and controller
adds mail table
se necesitaba
Merge branch 'dev' into nestier

Conflicts:
	app/controllers/backend/posts_controller.rb
Merge branch 'dev' of github.com:farfanoide/agalma into dev
nestier on the run
modifies header to use pundit
Merge branch 'dev' of github.com:farfanoide/agalma into dev
Various small fixes

updates seeds to have admin
fixes header for non users
chetea vistas backend indices ;)
backend aesthetics
pg for heroku
fuck heroku pg
'para mergear'