Added CONDITION block to HTML templates
Added TEMPLATE block to HTML templates, this allows us to call other templates.
Updated test for HTML templates
Improved OO-style in HTML template test
Merge branch 'templates' of ../../P-star