Calendar: fix month and year selection
Merge branch 'integration' of github.com:symphonycms/symphony-2 into integration