dfgdfgdfgdf
Merge remote-tracking branch 'origin/master'
adasdasdasd
Merge branch 'masterhead'

Conflicts:
	SocialClient/project.properties
	SocialClient/res/layout/activity_competition_layout.xml
	SocialClient/src/com/lang/social/chat/ChatFragment.java
	SocialClient/src/com/lang/social/chat/Transparent.java
	SocialClient/src/com/lang/social/competition/CompetitionActivity.java
	SocialClient/src/com/lang/social/controllers/ServerController.java
	SocialClient/src/com/lang/social/iocallback/IOCallBackHandler.java
Chat Fixed Completed.
fsdfsdfs
Merge remote-tracking branch 'origin/master'

Conflicts:
	SocialClient/project.properties
	SocialClient/res/layout/activity_competition_layout.xml
	SocialClient/src/com/lang/social/chat/Transparent.java
	SocialClient/src/com/lang/social/controllers/ServerController.java
	SocialClient/src/com/lang/social/iocallback/ActivitiesIOCallBackHandler.java
	SocialClient/src/com/lang/social/iocallback/IOCallBackHandler.java
	SocialClient/src/com/lang/social/room/RoomActivity.java
merged after added chat.