.
Merge branch 'master' of github.com:rvkennedy/SimulQtWidgets

Conflicts:
	QIntSliderEdit.cpp