new stuff
Merge github.com:ohdanbo/AndroidApp