Add bootstrap template
Merge branch '3.2'