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