test
Merge branch 'master' of https://github.com/pkxiuluo/healthlife

Conflicts:
	LocationLib/src/com/example/locationlib/MainActivity.java