renamed template name.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into renamed_template_name

Conflicts:
	pg_monz/pg_monz_template.xml