Merge pull request #1483 from stevewithington/develop

add fullcalendar display object