#1293 - Admin Bar - Bootstrap Conflict
Merge branch 'master' of https://github.com/tendenci/tendenci