Added calendar view
Merge branch 'development' of https://github.com/aakb/mso_calendar into development