shipit
important ui stuff
slightly less broken
Merge branch 'stable'

Conflicts:
	main.js
	tracker/main.js