added 4 weeks and 6 weeks calendar view
Merge branch 'shift-page'