chat&chupa update
chat&chupa update
DO NOT PULL
png update
Merge branch 'master' of https://github.com/hongkunyoo/athere-android
I removed conflict at UI.