reverse to 2.1
Merge branch 'master' of https://github.com/vapvarun/buddypress2.03