Remove uneeded code
Change "control panel" to "My Settings"; fixes #3601
Merge git://github.com/sugarlabs/sugar into SL4456