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