Increased version numbers to 06.03.06
Improvements to TemplateSelection