TemplateContainer: fixed bug dealing with empty data.
Application: bug fix session one
Merge branch 'stoewer' into wdat2-develop