CW-262 Added field base
CW-262 added view for related wiki
CW-262 Fixed label names
CW-249 Added feeds module
CW-249 exported wiki importer and configuration
CW-155 added related publications and resources
Exported view & settings for autocomplete. Search block moved in header
Committed search_autocomplete module
CW-248 Configuring search_autocomplete module
CW-50 configured modules for search
CW-248 configured search_autocomplete permissions
Fixed security on autocomplete view - use permissions
Merge branch 'develop' of github.com:/eu-osha/osha-website into develop

Conflicts:
	docroot/sites/all/modules/osha/osha_search/osha_search.features.fe_block_settings.inc
display blocks on OSHMail newsletters page
create OSHMail newsletter basic page
CW-258 - newsletter list and bugfixes for newsletter content selection
Merge pull request #204 from eugenst/twin_publication_final

CW-155 added related publications and resources
Merge pull request #202 from eugenst/cw_262

CW-262 Add entity reference field on Article, News, Highlight, Publication and show related Wiki Articles for each
Merge branch 'CW-249_osh_wiki_import' of https://github.com/dragos-dumi/osha-website into dragos-dumi-CW-249_osh_wiki_import

Conflicts:
	docroot/sites/all/modules/osha/osha_wiki/osha_wiki.features.field_instance.inc
	scripts/drupal_post_install.php
Merge branch 'dragos-dumi-CW-249_osh_wiki_import' into develop