Update composer.json
Update composer.json
Merge branch 'master' of git://github.com/aztech-dev/events into documentation

Conflicts:
	composer.json
Merge branch 'documentation' of git://github.com/aztech-dev/events into documentation