first commit
Merge https://github.com/davishsu/Android-App