[UPD] added a final name to the master pom so that all artifacts use "_" instead of "-"
[INI] First feature commit. This feature will work as an integration branch
[ENH] Interface improvements.
[FIX] Broken references leading to it4energy corrected.
[BRK] checkpoint
Merge branch 'feature/integrating_Rodolfo'

Conflicts:
	clean_install.sh
	deploy_run.sh
	install.sh
	ist.smartoffice.autonmactuation.alarmsevents/.gitignore
	ist.smartoffice.autonmactuation.alarmsevents/pom.xml
	ist.smartoffice.autonmactuation.scenarios/.gitignore
	ist.smartoffice.autonmactuation.scheduling/.gitignore
	ist.smartoffice.dataaccess.dataaquisition/.gitignore
	ist.smartoffice.dataaccess.historydata/pom.xml
	ist.smartoffice.dataaccess.historydata/src/ist/smartoffice/dataaccess/historydata/DataFileStorage.java
	ist.smartoffice.datapointconnectivity.wrappers.pubsub/pom.xml
	ist.smartoffice.datapointconnectivity.wrappers.pubsub/server_code/faye_server.js
	ist.smartoffice.datapointconnectivity.wrappers.rest/.gitignore
	ist.smartoffice.datapointconnectivity.wrappers.rest/api-javascript-sdk/datapointConnectivityServiceAPI.js
	ist.smartoffice.datapointconnectivity.wrappers.rest/api-javascript-sdk/index.html
	ist.smartoffice.datapointconnectivity.wrappers.rest/build.properties
	ist.smartoffice.datapointconnectivity.wrappers.rest/pom.xml
	ist.smartoffice.datapointconnectivity.wrappers.rest/src/ist/smartoffice/datapointconnectivity/wrappers/rest/DatapointConnectivityServiceRESTWrapper.java
	ist.smartoffice.datapointconnectivity/docs/API.pdf
	ist.smartoffice.datapointconnectivity/pom.xml
	ist.smartoffice.datapointconnectivity/src/ist/smartoffice/datapointconnectivity/AbstractDatapointConnectivityService.java
	ist.smartoffice.datapointconnectivity/src/ist/smartoffice/datapointconnectivity/DatapointAddress.java
	ist.smartoffice.datapointconnectivity/src/ist/smartoffice/datapointconnectivity/DatapointMetadata.java
	ist.smartoffice.datapointconnectivity/src/ist/smartoffice/datapointconnectivity/DatapointValue.java
	ist.smartoffice.datapointconnectivity/src/ist/smartoffice/datapointconnectivity/IDatapointConnectivityService.java
	ist.smartoffice.datapointconnectivity/src/ist/smartoffice/datapointconnectivity/ReadCallbackImpl.java
	ist.smartoffice.datapointconnectivity/src/ist/smartoffice/datapointconnectivity/WriteCallbackImpl.java
	ist.smartoffice.datapointconnectivity/src/ist/smartoffice/datapointconnectivity/osgi/trackers/Activator.java
	ist.smartoffice.datapointconnectivity/src/ist/smartoffice/datapointconnectivity/osgi/trackers/DatapointConnectivityServicesTracker.java
	ist.smartoffice.datapointconnectivity/src/ist/smartoffice/datapointconnectivity/package-info.java
	ist.smartoffice.deviceconnectivity.knxip/.gitignore
	ist.smartoffice.deviceconnectivity.knxip/build.properties
	ist.smartoffice.deviceconnectivity.knxip/pom.xml
	ist.smartoffice.deviceconnectivity.knxip/src/ist/smartoffice/deviceconnectivity/knxip/Activator.java
	ist.smartoffice.deviceconnectivity.knxip/src/ist/smartoffice/deviceconnectivity/knxip/DatapointConnectivityServiceKNXIPDriver.java
	ist.smartoffice.deviceconnectivity.knxip/src/ist/smartoffice/deviceconnectivity/knxip/KNXGatewayIPConfig.java
	ist.smartoffice.deviceconnectivity.knxip/src/ist/smartoffice/deviceconnectivity/knxip/KNXGatewayIPDriver.java
	ist.smartoffice.deviceconnectivity.meterip/build.properties
	ist.smartoffice.deviceconnectivity.meterip/pom.xml
	ist.smartoffice.deviceconnectivity.meterip/src/ist/smartoffice/deviceconnectivity/meterip/Activator.java
	ist.smartoffice.deviceconnectivity.meterip/src/ist/smartoffice/deviceconnectivity/meterip/DatapointConnectivityServiceMeterIPDriver.java
	ist.smartoffice.deviceconnectivity.meterip/src/ist/smartoffice/deviceconnectivity/meterip/MeterIPServiceConfig.java
	ist.smartoffice.deviceconnectivity.protocolintegration/build.properties
	ist.smartoffice.logger/pom.xml
	ist.smartoffice.logger/src/ist/smartoffice/logger/Activator.java
	ist.smartoffice.logger/src/ist/smartoffice/logger/Logger.java
	ist.smartoffice.logger/src/ist/smartoffice/logger/LoggerService.java
	ist.smartoffice.osgi/docs/API.pdf
	ist.smartoffice.osgi/pom.xml
	ist.smartoffice.osgi/src/ist/smartoffice/osgi/registries/AbstractServiceRegistry.java
	ist.smartoffice.osgi/src/ist/smartoffice/osgi/registries/IServiceRegistry.java
	pom.xml