Avoid uploading same file twice, bug fixes
Partly revert last commit
Some new features and bug fixes

https://github.com/DrKLO/Telegram/pull/200
https://github.com/DrKLO/Telegram/issues/455
Disable swipe back in google map view
Fixed resuming network when it not need
Merge remote-tracking branch 'remotes/upstream/dev' into dev

Conflicts:
	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
	TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java
	TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java
	TMessagesProj/src/main/java/org/telegram/ui/UserProfileActivity.java