update
Merge branch 'master' of https://github.com/radko26/Sirma_ITT_JAVACOURSE_CHAT

Conflicts:
	chat/module-client/src/main/java/com/sirma/itt/javacourse/chatapp/ContentLanguageManager.java