marged from cc-1.6 part2
added bp-custom.php