added timer for location updates, added markers for map, corrected webservice bugs
Merge branch 'master' into ssquire