Beginning of Android app
Merge remote-tracking branch 'origin/androidAppDev'