Some fixes
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
Merge branch 'master' of https://github.com/cotrix/cotrixrep.git
Removed is current user flag
Updated codelists group retrieving with new query
Fixed editing in users panel matrix
Updated showed roles