Merge branch 'feature/9341/complete' of https://github.com/evkennedy/islandora_newspaper_calendar_page into feature/9341/page-per-year

Signed-off-by: ekennedy <evkennedy@upei.ca>

Conflicts:
	islandora_newspaper_calendar_page.module
Merge branch 'feature/9341/complete' of https://github.com/evkennedy/islandora_newspaper_calendar_page into feature/9341/page-per-year

Signed-off-by: ekennedy <evkennedy@upei.ca>

Conflicts:
	islandora_newspaper_calendar_page.module