Merge pull request #24 from berendbaas/develop

Test: Resolving conflicts.
Update admin module
Update admin module 2
Update admin module 3

This update also changed the PDBC interface which resulted in minor
changes to every class that implemented or used a class that
implemented the PDBC interface.