Prevent textcolor button from being overwritten

Amend previous fix for the same issue by adjusting the css.
Merge pull request #968 from maschonber/commercial-hotfix

Prevent textcolor button from being overwritten
Merge branch 'commercial-hotfix' of github.com:alohaeditor/Aloha-Editor into commercial-hotfix

Conflicts:
	build/hotfix-changelog.md