[MRG] Automatic merge, trunk 50650 to 53359

git-svn-id: file:///var/local/code.tiki.org/tikisvn/branches/experimental@53362 b456876b-0849-0410-b77d-98878d47e9d5
[MOD] remove theme control button from the pref list, it is already there in the top

git-svn-id: file:///var/local/code.tiki.org/tikisvn/branches/experimental@53363 b456876b-0849-0410-b77d-98878d47e9d5