core
Merge branch 'master' of https://github.com/rp3/android-core

Conflicts:
	src/rp3/util/LocationUtils.java