working calendar but js still combined
Merge pull request #22 from kelmerp/calendar_v1

working calendar but js still combined