no message
Merge branch 'master' of https://github.com/perseus086/chat-mobile

Conflicts:
	src/com/entities/Group.java
	src/com/entities/SMS.java