buddypress language file translation
Merge branch 'master' of github.com:jiteshtandel/04CP018_no_son

Conflicts:
	wp-content/languages/buddypress-zh.mo
	wp-content/languages/buddypress-zh.po