Quelque detail de regler
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/plugins/wpmarketplace/libs/cache/timthumb_int_4ba2452827ea7f9b63f64d809228fa88.timthumb.txt
	wp-content/plugins/wpmarketplace/libs/cache/timthumb_int_7f24ec628adc697fcb1770d8f9694d4a.timthumb.txt
	wp-content/plugins/wpmarketplace/libs/functions.php
	wp-content/plugins/wpmarketplace/tpls/edit-profile.php