UI Modifications
Merge branch 'mircea' of git://github.com/raulmacarie/templates into mircea

Conflicts:
	assets/less/style.less