commit design groupe guide taille

commit design groupe guide taille
Merge branch 'master' of https://github.com/Fripes/wordpress

Conflicts:
	wp-content/plugins/bp-custom.php
	wp-content/plugins/buddypress/.DS_Store

wp-content/plugins/wpmarketplace/libs/cache/timthumb_int_895c69c2d2c1fb2
4d422f54bac6efd7b.timthumb.txt