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