update navibar
Merge branch 'master' of https://github.com/jasli2/evolution

Conflicts:
	app/assets/stylesheets/style.default.css.erb
	app/views/admin/admin/dashboard.html.erb
modify navibar
modify left menu background
Merge pull request #47 from cocosvsn/master

modify navibar and slide