Merge branch 'master' of 84.255.204.18:Rest

Conflicts:
	composer.json
Merge branch 'master' of 84.255.204.18:Rest