Added options to the config of the calendar
Merge branch 'develop' of git://github.com/debranova/calendar into develop