Merge pull request #1040 from jdalphon/trying_to_release

Fixing map picker for manual entry
Adresses Nats concerns on #852
Merge branch 'master' of git://github.com/isenseDev/rSENSE into trying_to_release