use fullcalendar as calendar plugin in xiaodun
Merge branch 'master' of https://github.com/XiaodunServerGroup/xiaodun-platform

Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/envs/common.py