correction js
Merge branch 'master' of https://github.com/Fripes/wordpress

Conflicts:
wp-content/plugins/bp-custom.php
test