issue #6
Merge branch 'development' into wildfly

Conflicts:
	imixs-marty-ejb/src/main/java/org/imixs/marty/ejb/AdminPService.java
	imixs-marty-ejb/src/main/java/org/imixs/marty/ejb/SetupService.java
	imixs-marty-ejb/src/main/java/org/imixs/marty/ejb/security/LDAPLookupService.java
	imixs-marty-ejb/src/main/java/org/imixs/marty/ejb/security/UserGroupService.java