Merge pull request #1697 from stevewithington/develop

fullcalendar updates
Merge pull request #1699 from stevewithington/develop

bug fix: cf11/Win png issue
Updating image2 plugin