added some UI
Merge branch 'hristo'

Conflicts:
	.project
	app/views/layouts/application.html.haml
	log/development.log

first merge