Merge branch 'master' of https://github.com/benjamincrozat/wp-toolbox

Conflicts:
	composer.json
Merge branch 'master' of https://github.com/benjamincrozat/wp-toolbox

Conflicts:
	composer.json
Fuck it