calendar
日历控件
Merge branch 'master' of https://github.com/fpi-inc/webapp

Conflicts:
	src/js/choose/ChooseController.js