Some fixes
Merge branch 'master' of https://github.com/amandziy/StartItUp
Fix Calendar json
Merge branch 'master' of https://github.com/amandziy/StartItUp