merge
Merge branch 'develop' of https://github.com/Westpic/solap4py-java.git
into develop

Conflicts:
	src/fr/solap4py/core/Solap4py.java
	src/fr/solap4py/core/Solap4pyEntryPoint.java