update requirements
Merge branch 'master' of https://github.com/dspasic/Jacobine

Conflicts:
	composer.lock
Merge branch 'master' of https://github.com/andygrunwald/Jacobine

Conflicts:
	composer.lock
Add Config/config.yml
Merge branch 'master' of github.com:dspasic/Jacobine