Merge pull request #1171 from sightmachine/develop

Latest (final) fixes for JNAP
Merge pull request #1173 from brooksryba/develop

Develop
Merge branch 'JNAP' of github.com:sightmachine/SimpleSeer into develop
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Removing session test