Merge pull request #1016 from brooksryba/develop

Develop
Modal stuff
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop