merged in BuddyPress 1.6 default theme component templates