#55: General settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/zo2_blank_template/templateDetails.xml