Updated for use with Sharelocation
Merge branch 'master' of https://github.com/mrfuzzemz/project6858

Conflicts:
	Sandbox/bin/classes/com/privacy/sandbox/MainActivity.class
	Sandbox/bin/classes/com/privacy/sandbox/R$id.class
Merge branch 'master' of https://github.com/mrfuzzemz/project6858