UI updates
Merge branch 'master' of https://github.com/AsteroidMiner/AsteroidMiner

Conflicts:
	html/main-chad-edit.html