fdg
Merge branch 'developer' of https://github.com/Anteo4Ever/dawii.git into
developer

Conflicts:
	rci-cli/src/main/java/persistence/jpa/JPAServiceFactory.java
	rci-cli/src/main/java/persistence/test/StartData.java
	rci-cli/src/main/java/persistencia/servicefactory/ServiceFactory.java
Merge branch 'developer' of https://github.com/Anteo4Ever/dawii.git into developer