some sidebar-nav styling
some more styling: +search; +side bar fixed
added/fixed some styling
slide added: TODO: external js and refactor
Merge branch 'master' into dev

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/frontend/shared/_side_nav.html.erb
social updated + slideshow refactor + minor changes
merged in dev branch
some new structure styling
sidebar 'arrow' style
replaces imagespath on slider
modifies nav links and routes
some logo styling
modifica giladas
adds zipcode and zone to branches
Merge branch 'dev' of github.com:farfanoide/agalma into dev
Merge branch 'dev'

Conflicts:
	app/views/application/_side_nav.html.erb
	db/seeds.rb
arrega giladas css;