Downloader done, but parsing loaded json has issues, fixed a calendar bug
Merge remote-tracking branch 'origin/master'