Implementing group chat
Implementing Group Chat
Merge branch 'master' of TalasZh/AucaChat

Conflicts:
	bin/SplashActivity.apk
	bin/classes.dex
	bin/classes/com/quickblox/sample/Constants/Constants.class
	bin/classes/com/quickblox/sample/activities/FriendList.class
	bin/classes/com/quickblox/sample/activities/MainActivity.class
	bin/classes/com/quickblox/sample/activities/NewRoom$1.class
	bin/classes/com/quickblox/sample/activities/NewRoom.class
	bin/classes/com/quickblox/sample/activities/SplashActivity.class
	bin/classes/com/quickblox/sample/activities/UsersListActivity.class
	bin/classes/com/quickblox/sample/chat/MyChatController$2.class
	bin/classes/com/quickblox/sample/chat/MyChatController.class
	bin/classes/com/quickblox/sample/dataHolder/DataHolder.class
	bin/resources.ap_
	src/com/quickblox/sample/Constants/Constants.java
	src/com/quickblox/sample/activities/FriendList.java
	src/com/quickblox/sample/activities/MainActivity.java
	src/com/quickblox/sample/activities/NewRoom.java
	src/com/quickblox/sample/activities/SplashActivity.java
	src/com/quickblox/sample/chat/MyChatController.java
	src/com/quickblox/sample/dataHolder/DataHolder.java
Adding .gitignore file to untrack .class files