update composer.lock
Merge branch 'master' of https://github.com/lowki93/TerraNova

Conflicts:
	composer.lock