Group y sms de nuevo
Merge branch 'master' of github.com:perseus086/chat-mobile

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