Merge branch 'master' into develop
Merge branch 'master' into develop
Fixed the 'merging from master updates my composer.json deps' problem.
Updated slate calendar to new endpoint.
composer.json file bumped
1.0.17
Merge branch 'develop'