Initial commit
Merge github.com:ohdanbo/AndroidApp