adminsev and stuff
adminserv and stuff
Revert "adminserv and stuff"

This reverts commit e985a155e082518058cbde66331d52c264aab54b.
Revert "Revert "adminserv and stuff""

This reverts commit 325aa003baf3db6115c214856c0eccda3ce6fdbb.
preliminary adminserv access flags, still slightly buggy
Merge remote-tracking branch 'matildel/master'

Conflicts:
	src/Makefile.am
	src/Makefile.in
	x3.conf.example