Tuned UI
Merge branch 'master' into feature/tune-ui

Conflicts:
	public/css/styles.css
Merge branch 'feature/tune-ui'