First release version of Android app, TODO UI
Merge branch 'AndroidDebug'