Refactoring code
Merge branch 'develop' of https://github.com/openDAQ/opendaq-gui into develop

Conflicts:
	opendaq/DAQControl.py