stop-near-location work
Merge branch 'master' of https://github.com/Fuggle/engine-web

Conflicts:
	cache/cache_functions.php