Merge changes

git-svn-id: http://plugins.svn.wordpress.org/buddypress-xprofile-custom-fields-type/trunk@802353 b8457f37-d9ea-0310-8a92-e5e31aec5664
Version 1.5.7.9
Fixing a bug by moggedb.

git-svn-id: http://plugins.svn.wordpress.org/buddypress-xprofile-custom-fields-type/trunk@802354 b8457f37-d9ea-0310-8a92-e5e31aec5664
Version 1.5.7.9
Fixing a bug by moggedb.

git-svn-id: http://plugins.svn.wordpress.org/buddypress-xprofile-custom-fields-type/trunk@802355 b8457f37-d9ea-0310-8a92-e5e31aec5664
Version 1.5.7.9

git-svn-id: http://plugins.svn.wordpress.org/buddypress-xprofile-custom-fields-type/trunk@802356 b8457f37-d9ea-0310-8a92-e5e31aec5664
Urls of author and plugin.

git-svn-id: http://plugins.svn.wordpress.org/buddypress-xprofile-custom-fields-type/trunk@802358 b8457f37-d9ea-0310-8a92-e5e31aec5664
Solving conflicts

git-svn-id: http://plugins.svn.wordpress.org/buddypress-xprofile-custom-fields-type/trunk@802359 b8457f37-d9ea-0310-8a92-e5e31aec5664
Changed Author and plugin URI.

git-svn-id: http://plugins.svn.wordpress.org/buddypress-xprofile-custom-fields-type/trunk@802360 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'master' of https://github.com/donmik/buddypress-xprofile-custom-fields-type