ticket:4 Add bootstrap and fix tests
Merge branch 't4_template-context'