Fullcalendar 2.0->1.6
Merge remote-tracking branch 'origin/master'