update for bootstrap
Merge branch 'master' into trips_templates
WIP