Merge branch 'dev' of https://github.com/DrKLO/Telegram

Conflicts:
	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
Merge branch 'master' of https://github.com/fduraibi/Telegram

Conflicts:
	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
Merge branch 'master' of https://github.com/fduraibi/Telegram