Setup Android project + Architecture illustration
Merge remote-tracking branch 'origin/master'