@ composer.json: updated
Merge branch 'master' of github.com:dariushha/zinux

Conflicts:
	composer.json