* commit 'fcb0c1b3':
  Final version of user story "Acl editor"

Conflicts:
	src/main/java/org/genesys2/server/service/AclService.java
	src/main/resources/spring/spring.properties
	src/main/webapp/WEB-INF/jsp/acl/editor.jsp