composer.lock updated
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server

Conflicts:
	composer.lock