adds galleries to posts
Merge branch 'master' into dev

Conflicts:
	app/assets/stylesheets/modules/typography.scss
	app/views/application/_pages_nav.html.erb
Merge branch 'dev' of github.com:farfanoide/agalma into dev
Merge branch 'dev'

Conflicts:
	app/views/application/_pages_nav.html.erb