Merge origin/master

Conflicts:
	app/ApiModule/presenters/BarrelKindPresenter.php
	app/ApiModule/presenters/BarrelPresenter.php
	app/ApiModule/presenters/BasePresenter.php
	app/config/config.local.neon