More fixes to plugins
Merge branch 'webadmin_refactoring' of github.com:dhoepelman/Alitheia-Core into webadmin_refactoring