First draft of the new UDeviceConfiguration
Merge remote-tracking branch 'origin/master' into UDeviceConfiguration
Commit for conditions, need some bug fixing
Communication

 * Simulator reading data.json and starting services with bonjour
 * Change uSocket for UCommunicationHandler
 * Breakdown of JsonSerializable interfaces
 * First interfaces and implementations of protocol
New config window, very amaze, much improvement
Backup
Fixed some visual bugs
Merge pull request #86 from uCtrl/Requests

Requests
Merge branch 'master' into conditionsFromMockup

Conflicts:
	src/uCtrlCore/uCtrlCore.pro
Merge branch 'master' into conditionsFromMockup

Conflicts:
	src/uCtrlCore/uCtrlCore.pro
	src/uCtrlDesktop/data.json
	src/uCtrlDesktop/main.cpp
Merge pull request #90 from uCtrl/conditionsFromMockup

Editing of time conditions!
Add condition button with combo box
Merge pull request #91 from uCtrl/addConditionsWithType

Add condition button with combo box
Almost fully functional info + config window. There's a little bit of binding left to do
Also, I've improved the UPlatform's "More Info" button with transitions
Fixed the textbox invisible icon
Fixed some errors that I didn't see when I deleted UDeviceInfo.h
Merge branch 'master' into UDeviceConfiguration

Conflicts:
	src/uCtrlCore/Platform/uplatform.h
	src/uCtrlCore/uCtrlCore.pro
	src/uCtrlDesktop/data.json
	src/uCtrlDesktop/qml/uCtrlDesktopQml/Scenario/UScenarioWidget.qml
	src/uCtrlDesktop/qml/uCtrlDesktopQml/Scenario/UTaskConditionWidget.qml
	src/uCtrlDesktop/qml/uCtrlDesktopQml/Scenario/UTaskWidget.qml
Merge pull request #92 from uCtrl/UDeviceConfiguration

U device configuration
Add updated status
Self-code-review
>
Commit for Harmel