- minor bugs fixed
Merge branch 'master' of https://github.com/advancedrendering/project

Conflicts:
	ExtraBees2/src/gui/PyQtGraphTest.py
Merge branch 'master' of https://github.com/advancedrendering/project
- removed play/pause button... added combo box
Merge branch 'master' of https://github.com/advancedrendering/project

Conflicts:
	ExtraBees2/src/gui/PyQtGraphTest.py
	ExtraBees2/src/gui/gui.ui
aehm