Created the Android project
Merge branch 'setup'
Merge remote-tracking branch 'work/master' into setup
Merge branch 'setup'