Fix Qt4 incompatibilities
Update color widget
Merge branch '0.9.4-Qt4.7-fix'

Conflicts:
	knotter_info.pri