Composer Update
Merge branch 'composer-update' of https://github.com/adesigns/calendar-bundle into composer-update

Conflicts:
	composer.json