pre pull
Merge branch 'master' of https://github.com/JMaltat/fragaria-adapter-cayenne
check => assert dans test
de la merde
Merge branch 'master' of https://github.com/JMaltat/fragaria-adapter-cayenne

Conflicts:
	derby.log
	src/test/java/nc/isi/fragaria_adapter_cayenne/TestCayenneAdapter.java