no message
Merge branch 'master' of https://github.com/lelexxx/Social

Conflicts:
	Java/SocialChatAndroid/.idea/workspace.xml