refactoring
Merge master into develop

Conflicts:
	composer.json