Fixed Merge Conflict
Merge branch 'development' of github.com:catalystclass/bookstrap into development
All addSprints now Calendar