Commit of CUPUS v1.0
Commit of CUPUSMobileApplication
Added "samplingCountPerPeriod" option to CSVWrapper so it can simulate "1 measurement per second."
Fixed potential data loss with multiple measurements at the same timestamp.
Fixed jena dependencies pulling in log4j.
Fixed obsolete "layout" definition in logback.xml (http://logback.qos.ch/codes.html#layoutInsteadOfEncoder)
Allow registration of sensors, through the restapi, that do not have a sensorId yet. The new sensorId is added to the metadata file.
Added initial version of sensor delete method to GSN rest api.
Implemented "delete sensor from LSM" functionality. Does not yet deal with added custom RDF.
CUPUS v2 and QoS manager
update of the config file
Merge from "pub-sub-integration" branch

Conflicts:
	utils/utils.commons/src/main/resources/properties/openiot.properties
Added a template wrapper for mobility support; minor fix of gsn regarding null values
Update of the CUPUS mobile application provided by Marko Pavelic
updated gitignore to ignore intelliJ files and .gradle files
gitignore update
updated ide core layout lifecycle
Merge remote-tracking branch 'origin/develop' into develop
updated ide.core with new navigation layout and properties file
Merge branch 'develop' of github.com:OpenIotOrg/openiot into develop
Merge branch 'develop' into security-integration

Conflicts:
	modules/lsm-light/lsm-light.client/pom.xml
	modules/x-gsn/src/main/java/org/openiot/gsn/http/restapi/VSManagerService.java
	modules/x-gsn/src/main/java/org/openiot/gsn/metadata/LSM/LSMRepository.java
	modules/x-gsn/src/main/java/org/openiot/gsn/metadata/LSM/LSMSensorMetaData.java
	modules/x-gsn/src/main/java/org/openiot/gsn/metadata/LSM/SensorAnnotator.java
	modules/x-gsn/src/main/java/org/openiot/gsn/vsensor/LSMExporter.java
	modules/x-gsn/src/main/java/org/openiot/gsn/wrappers/general/CSVHandler.java
	modules/x-gsn/src/main/java/org/openiot/gsn/wrappers/general/CSVWrapper.java
	modules/x-gsn/src/main/java/org/openiot/gsn/wrappers/general/CSVWrapperTest.java
	ui/ide/ide.core/src/main/java/org/openiot/ide/core/MenuFactory.java
	utils/utils.commons/src/main/java/org/openiot/commons/util/PropertyManagement.java
	utils/utils.commons/src/main/resources/properties/openiot.properties
updated to SensorAnotator