pré merge
Merge branch 'master' of https://github.com/JMaltat/fragaria-adapter-cayenne

Conflicts:
	src/main/java/nc/isi/fragaria_adapter_cayenne/CayenneAdapter.java