asd
Merge branch 'master' of https://github.com/waeswaes/Tesys

Conflicts:
	src/main/java/org/tesys/connectors/db/elasticsearch/ElasticSearch.java
	src/main/java/org/tesys/connectors/db/elasticsearch/ElasticSearchConnector.java
	src/main/java/org/tesys/core/analysis/telemetry/ProjectTrackingAggregator.java
	src/main/java/org/tesys/core/db/Database.java
asd