Separate folder for android app
Merge remote-tracking branch 'origin/master' into Mohammad