changed event color
conflict change
Merge branch 'master' of github.com:kennyszub/ftcalendar