Gui
Merge branch 'master' of https://github.com/karlkilden/ref

Conflicts:
	core/impl/src/main/java/com/kildeen/ref/application/module/authorization/PermissionResolverImpl.java
	web/pom.xml