Fixed chat
Merge branch 'master' of github.com:/Hyperactivity/android-app

Conflicts:
	src/com/hyperactivity/android_app/activities/ChatFragment.java
	src/com/hyperactivity/android_app/activities/ChatListFragment.java