* Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/fullcalendar.min.js