added custom time display to player controls, can now pull city and state info from geolocator
working on testing
Merge branch 'master' into stylebranch