update
Merge branch 'wip_adm' of https://github.com/inkscope/inkscope into wip_adm

Conflicts:
	inkscopeCtrl/poolsCtrl.py
add user management
add user management
Merge remote-tracking branch 'origin/wip_adm' into wip_adm