Revert "Merge branch 'master' of github.com:sbutler/spacescout_web"

This reverts commit 1294fda1f5b3aadbf5605e463c37f31c2102b4a7, reversing
changes made to aad3239ff5ac3e3f15ad1142f25c2936d11cc28a.

Conflicts:
	static/js/desktop.js
	static/js/global.js
	templates/spacescout_web/base-desktop.html