Fixed some files and update xml file
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/zo2_base/templateDetails.xml