new calendar workign properly
Merge branch 'newcal'