ground profile update
Merge branch 'master' of https://github.com/hongkunyoo/athere-android

Conflicts:
	res/layout/fragment_square_profile.xml