Upgrade AndroidBootstrap
Added back the developed code
Merge branch 'feature/UpgradeAndroidBootstrap' into develop