fixed a bug in the naming of default conf.controllername
Merge branch 'controller-naming-bug'