SPOT-1839
Merge branch 'master' of github.com:uw-it-aca/spacescout_web

Conflicts:
	templates/spacescout_web/app.html