composer.lock
Merge branch 'develop' of https://github.com/nass59/hoper into develop

Conflicts:
	composer.lock