Date formatter now supports calendar theme refs #2717;
Fix a rebase bug
Exported teaser date calendar setting for news refs #2717
Exported date theme calendar setting for publications refs #2717
Merge branch '2717_date_formmater_calendar' of https://github.com/dragos-dumi/osha-website into dragos-dumi-2717_date_formmater_calendar

Conflicts:
	docroot/sites/all/modules/osha/osha.module
	docroot/sites/all/themes/osha_frontend/template.php
Merge branch 'dragos-dumi-2717_date_formmater_calendar' into develop