lighter ui theme
Merge branch 'refs/heads/master' into theme-light
Merge branch 'refs/heads/master' into theme-light

Conflicts:
	public/css/style.css
	public/js/track.js
colors