fix time offset
Merge remote-tracking branch 'origin/master'

Conflicts:
	SimulatedLocationTest/SimulatedLocationTest/EAISimulatedLocationManager.m