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

Conflicts:
	wp-content/plugins/admin-menu-editor/images/gion/COPYING
	wp-content/plugins/bp-custom.php