seriously improved UI
Merge branch 'design-color'

Conflicts:
	app/assets/stylesheets/custom.css.scss
commit bugs