Refactored some of Bootstrap class into an abstract BootstrapBase clss
Merge branch 'develop'