update gemset and requirements
Use Geolocation Marker remove old scratch, add test locations and jasmine for automated tests