Resolved conflicts
Merge branch 'master' of https://github.com/roisnetf/EMN-AndroidChat.git

Conflicts:
	DansTaTchat/res/values/strings.xml