finished if statement implementation
Fixed HTML escaping in eval python expressions

And some test cases
Merge branch 'template-engine'