hash
some ui fix
Merge branch 'master' of github.com:projectus/projecto

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