Initial Version

Set up the android project
Merge remote-tracking branch 'upstream/master'