Merge pull request #11 from stephandev/master

Preventing the app from sleep in MapView, and added a method for the Datalink textfield
Code cleanup.
Bug Fixes
Merge pull request #27 from mshamash/master

Bug fixes...