to fix for fullcalendar
Merge branch 'liugenjie'