Add map and html5 geolocation for desktop testing purposes
Merge branch 'master' of https://github.com/team-notch/franklin