misc fixes
Merge branch 'master' of https://github.com/Bearded-Hen/Android-Bootstrap