composer
Merge branch 'master' of https://github.com/exaprint/cms-api

Conflicts:
	composer.lock