enhance master code with better slave and user mgmt modules
Authored by: lilyco 2010-02-26
Parent: [r380]
Child: [r382]