update
Merge branch 'master' of https://github.com/bitarlan/Telegram

Conflicts:
	TMessagesProj/build.gradle