Fixing UI
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/application.conf
	public/stylesheets/bootstrap.css