work on db creation
Merge branch 'develop' of https://github.com/mattcrock/AndroidApp into develop