Added cx1 compiler settings
Merge branch 'cx1', remote branch 'origin/master' into cx1
cx1 Compiler settings changed