timing clear location data
Merge branch 'master' of https://git.duapp.com/appidx2bit0mk1a

Conflicts:
	app/publish/pubLocation.js