7月21日修改
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	wp-content/plugins/wp-fullcalendar/wp-fullcalendar.php
	wp-content/themes/musicweek/css/core.css
	wp-content/themes/musicweek/css/load.css
	wp-content/themes/musicweek/less/core.less