Pushing dynamic character colors.
fixing conflicts. Changed var ref to /kenjiDev
Merge branch 'charColor' into develop