Updater composer.json
Added composer.json
Create composer.json
Update composer.json
Update composer.json
Update composer.json
Update composer.json
Merge branch 'master' of maclovr:maclovr/Framework into develop

* 'master' of maclovr:maclovr/Framework:
  Added composer.json
  Updater composer.json

Conflicts:
	composer.json
Merge branch 'master' of https://github.com/nkstamina/Framework into develop

* 'master' of https://github.com/nkstamina/Framework:
  Update composer.json
  Update composer.json
  Update composer.json
  Update composer.json
  Create composer.json

Conflicts:
	composer.json