Master calendar and final changes
Merge pull request #56 from Cynaria/moar_calendar

Master calendar and final changes