Changed native lib loaded
One more fix for native lib loader
Fixed build with last mp4parser
Bug fixes
Bug fixes
Bug fixes
Bug fixes
Merge commit 'b33d5f078674667c917427b98de6242eb2b2a377'
Merge commit '6e386c58841f6b10d6db22e7192dfe800cb7b9e4'
Merge commit '3cd9b847e15a8d12927c7ecad57aa7e256c548b0'
Merge commit 'a4af1fb2f7fb7eef97881cdee0573d71bde41cae'

Conflicts:
	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
Merge commit '5ddd8a094071f9288f338913c67a1c443f6061a9'
Merge commit '4ddfda63403e69c3c35f8c7f6bef850533af8599'
Merge commit '6c4c5cf311d966bc9e2772b7c8e087e6c5d2015c'

Conflicts:
	TMessagesProj/src/main/java/org/telegram/android/Emoji.java