added calendar view, footer contacts
Merge remote-tracking branch 'origin/master'