bug fixes
Merge branch 'master' of https://github.com/sinnott74/AndroidProject2.git
bug fixes