팝업 에러 수정
Merge branch 'master' of https://github.com/andpark/Telegram

Conflicts:
	TMessagesProj/src/main/java/org/telegram/ui/Views/ChatActivityEnterView.java