Fixed the calendar. Before it wasnt showing pre-build events, now everything shows properly. Had to remove eventSources2, and changed eventSources to be only one event model. Also changed the cactus image.
Fixed the calendar and also changed cactus image. Merge branch 'issue47' into dev