Merge branch 'master' of https://github.com/nfqakademija/group4-studio

Conflicts:
	composer.json