soft UI and logo
Merge branch 'soft-ui' into soft-ui-merge

Conflicts:
	app/views/main.scala.html
	public/stylesheets/main.css