WTF !!!!!!!!!!!!!
Merge branch 'master' of https://github.com/miserymind/td-wp-BEC

Conflicts:
	wp-content/themes/auxdelicesparis/css/style.less
	wp-content/themes/auxdelicesparis/functions.php