converts navs into boxes
Merge branch 'ft_redesign' of github.com:farfanoide/agalma into ft_redesign

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