separated specific from template roles in fingerprint and queries, fixed
email issue
Merge branch 'master' of https://github.com/cotrix/cotrixrep.git

Conflicts:
	cotrix/cotrix-web-permissionmanager/src/main/java/org/cotrix/web/permissionmanager/server/PermissionServiceImpl.java