#1355 - Event Confirmation Emails - Error
version bump
#1294 - added updates to remove bootstrap base on setting
#1301 - added icons to some items on the admin bar
Merge branch 'master' into 1301_tendenci_admin_mega_menu
Merge branch '1301_tendenci_admin_mega_menu' into bixly-testing