Fix issues with BP 1.6

git-svn-id: http://plugins.svn.wordpress.org/bp-group-hierarchy/trunk@773012 b8457f37-d9ea-0310-8a92-e5e31aec5664
Updating trunk, translations to 1.4.0

git-svn-id: http://plugins.svn.wordpress.org/bp-group-hierarchy/trunk@773019 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge remote-tracking branch 'remotes/trunk'