Merge branch 'voiceIntents'
Voice control for limitless LED
Merge branch 'limitlessLED' into limitlessLedMerge

Conflicts:
	src/uCtrlDesktop/Voice/uvoicecontrolapi.cpp
Fix light for new life
Integrate light intensity (dimmer)
Added a combo box to select scenario
Merge pull request #133 from uCtrl/limitlessLedMerge

Limitless led merge
Added alerts
Connected uCtrlApi errors to alerts
Added Websockets
Fixed Websocket slots/signals
Added Settings page
Added all possible device type. Started implementing the Light customized info
Recommendation building blocks
Merge branch 'breadcrumb'

Conflicts:
	src/uCtrlDesktop/Resources.qrc
	src/uCtrlDesktop/qml/main.qml
	src/uCtrlDesktop/qml/scenario/Scenarios.qml
fixed conflits
fixed conflicts in ressource.qrc
Refactored the device interface to look more like the mockups
Implementation of facade for easier use in QML
Forgot .pro