template config updated
Merge branch '14.01'

Conflicts:
	config/configurations/template