Fixed issues with roles and a range of other stuff
Merge branch 'master' of https://github.com/Wadpam/guja

Conflicts:
	guja-base/src/main/java/com/wadpam/guja/readerwriter/ResponseCodeProtoMessageBodyWriter.java
	guja-core/src/main/java/com/wadpam/guja/oauth2/api/AdminResource.java
	guja-core/src/main/java/com/wadpam/guja/oauth2/dao/DConnectionMapper.java
	guja-core/src/main/java/com/wadpam/guja/oauth2/dao/DFactoryMapper.java
	guja-core/src/main/java/com/wadpam/guja/oauth2/dao/DOAuth2UserMapper.java
	guja-core/src/main/java/com/wadpam/guja/oauth2/dao/DUserMapper.java
	guja-core/src/main/java/com/wadpam/guja/oauth2/dao/GeneratedDConnectionDaoImpl.java
	guja-core/src/main/java/com/wadpam/guja/oauth2/dao/GeneratedDFactoryDaoImpl.java
	guja-core/src/main/java/com/wadpam/guja/oauth2/dao/GeneratedDOAuth2UserDaoImpl.java
	guja-core/src/main/java/com/wadpam/guja/oauth2/dao/GeneratedDUserDaoImpl.java
	pom.xml
Removed AdminResource (use the AdminTask instead)
Use mardao 3.0.5
Added support for Velocity temples
Merge branch 'master' of https://github.com/Wadpam/guja
Merge remote-tracking branch 'origin/master' into issue/federated

Conflicts:
	guja-core/src/main/java/com/wadpam/guja/oauth2/api/OAuth2Resource.java
	guja-core/src/main/java/com/wadpam/guja/oauth2/api/OAuth2UserResource.java