Fixes possible issue with bootstraptheme menu width/height configuration
revert to correct classname for bootstrap 2 navbar
Merge branch 'develop' into revisions