UID's
javax.annotations api 1.2
Merge branch 'master' of
https://github.com/Rudin-Informatik/cdi-security.git

Conflicts:
	impl/src/main/java/li/rudin/core/security/impl/RestrictionInterceptor.java
	impl/src/main/java/li/rudin/core/security/impl/user/context/SessionScopedCurrentUser.java