Upgrade Buddypress and CMS Tree View

Also fixes bug 833139 - re-fix XSS vulnerability after previous update