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

Conflicts:
	TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java
	gradle/wrapper/gradle-wrapper.properties