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

Conflicts:
	TMessagesProj/src/main/java/org/telegram/android/MessageObject.java
	TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
	TMessagesProj/src/main/res/values-nl/strings.xml