...
Merge branch 'master' of https://github.com/advancedrendering/project

Conflicts:
	ExtraBees2/src/gui/PyQtGraphTest.py