Eliminando archivos inncesarios
Adaptando css de menu-user
Adaptando estilos para navbar
Merge remote-tracking branch 'origin/devise' into devise

Conflicts:
	app/views/layouts/navbar.html.haml