Bootstrap template
Namespaces
Merge branch 'bootstrap'