Bug fixes
Perfect forward secrecy in secret chats, phone change, telegram.me links support
Merge branch 'dev'
Merge branch 'master' of https://github.com/DrKLO/Telegram

Conflicts:
	TMessagesProj/libs/armeabi-v7a/libtmessages.4.so
	TMessagesProj/libs/armeabi/libtmessages.4.so
	TMessagesProj/libs/x86/libtmessages.4.so
	TMessagesProj/src/main/AndroidManifest.xml
	TMessagesProj/src/main/java/org/telegram/android/GcmBroadcastReceiver.java
	TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
	TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java