Composer.json update
Merge branch 'master' of https://github.com/norbin/Calendar
Merge branch 'master' of https://github.com/norbin/Calendar