update
Merge branch 'master' of https://github.com/KickingTheTV/Panamax_templates

Conflicts:
	ocr.pmx