Init
Merge branch 'master' of https://github.com/safexbristol/android_app