Some quick merges, and fixes, features, memory leak issues fixes
Merge remote-tracking branch 'origin/ui_overhaul' into ui_overhaul

Conflicts:
	app/client/js/controllers/main-controller.js
Merge remote-tracking branch 'origin/ui_overhaul' into ui_overhaul