Merge branch 'develop'

# Conflicts:
#	src/CaptDeviceControl/__init__.py

src/CaptDeviceControl/__init__.py

@@ -8,4 +8,4 @@ import sys
 from .CaptDeviceConfig import CaptDeviceConfig as Config
 from .controller.BaseAD2CaptDevice import BaseAD2CaptDevice as Controller
 from .model.AD2CaptDeviceModel import AD2CaptDeviceModel as Model
-from .view.AD2CaptDeviceView import ControlWindow as View
+from .view.AD2CaptDeviceView import ControlWindow as View
\ No newline at end of file