nothing
Merge branch 'master' of https://github.com/wzAdmin/buddyLocate

Conflicts:
	Client/Android/src/com/wzAdmin/buddy/utils/PhoneUtils.java