Condition realized
Merge branch 'conditions-in-templates'

Conditions in templates added
Ready for release