committing from Android by Habib
Merge remote-tracking branch 'ProTrack-Android/master'