Adding the android app
Merge branch 'android-dev'