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

Conflicts:
	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
	TMessagesProj/src/main/java/org/telegram/messenger/TLRPC.java
	TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java