js syntacs errors
Merge branch 'master', remote-tracking branch 'origin'
Individual Calendar is in pending