merge bootstrap
Merge remote-tracking branch 'origin/event-creation' into templates
Re-reference bootstrap