some small updates
Merge branch 'master' of https://github.com/contejo/core
event_calendar changes