forget to commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Jz Condition Normalization 3 - Co.jrxml
	Jz Condition Normalization 3.jrxml