Add section to device list
Self code review
Added removed code back into business
Commit for conditions, need some bug fixing
Merge pull request #88 from uCtrl/groupPlatform

Group platform
Fix auto-merge of groupSystem
Communication

 * Simulator reading data.json and starting services with bonjour
 * Change uSocket for UCommunicationHandler
 * Breakdown of JsonSerializable interfaces
 * First interfaces and implementations of protocol
Backup
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
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