[FIX] AffixConverter minor error
Merge remote-tracking branch 'origin/operatorSinCosTan' into develop

Conflicts:
	src/cal/AffixConverter.java
                src/cal/MathHelper.java