BUGFIX for seankenny/fullcalendar #24
Merge branch 'resourceView'

Conflicts:
	dist/fullcalendar.min.js