some changes
Merge branch 'master' of github.com:unoegohh/building.instroy

Conflicts:
	composer.lock