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

Conflicts:
	composer.json