arregla header branches
actualiza show
adds branches to pages
Merge branch 'master' into dev
adds nuestras_sedes
organizes side-nav
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 'master' of github.com:farfanoide/agalma

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
adds modernizr to production
adds env relative seeds
updates modernizr to check only for touch events
updates pages menu
modifies various views
Merge branch 'dev' into chudix

Conflicts:
	app/assets/stylesheets/modules/typography.scss
	app/models/branch.rb
	app/views/application/_slide.html.erb
	app/views/posts/index.html.erb