updated template config
Merge branch '14.06'