#1118 bootstrap changes
#1118 bootstrap changes
Merge branch '1118-bootstrap-fixes' into bixly-testing

Conflicts:
	tendenci/addons/events/templates/events/edit.html
	tendenci/addons/events/templates/events/view.html
	tendenci/addons/make_payments/templates/make_payments/nav.html
	tendenci/apps/contacts/templates/contacts/nav.html
	tendenci/apps/dashboard/templates/dashboard/customize.html
	tendenci/apps/entities/templates/entities/nav.html
	tendenci/apps/reports/templates/reports/report_run_create.html
Merge branch 'bixly-testing' of https://github.com/tendenci/tendenci into bixly-testing