updated bootstrap templates
Merge branch 'dev' into prod