Final commit on v3.1
Merge branch 'master' of https://github.com/hongkunyoo/athere-android

Conflicts:
	src/com/pinthecloud/athere/fragment/ChupaChatFragment.java