Fixed merge conflicts.

[TIMOB-12759] Fixed list of options being displayed in help screen when colors are enabled on Windows.

Conflicts:
	CHANGELOG.md
Merge branch '3_2_X' into timob-12759_3_2_X

Conflicts:
	CHANGELOG.md
Merge pull request #117 from appcelerator/timob-12759_3_2_X

[TIMOB-12759] Fixed list of options being displayed in help screen when colors are enabled on Windows.