Fixed a warning in the wiki portlet
osha_wiki display mode for featured wiki articles on publications
Merge branch 'release' into develop

Conflicts:
	docroot/sites/all/modules/osha/osha/osha.module