added validation to journal and calendar entities
Merge branch 'master' of github.com:calliopeinitiative/marca
fixing a conflict for a merge.  Grabbed the code from github for display.html.twig for calendar.  Will rework on validation using this code