add json processor
merge conflict
Bugfixes in calendar methods - need to revisit this later
Merge branch 'development' of github.com:MakersSpark/Maker-Spark-Server into development
Merge branch 'development'