Create categories.json file for migration
Sync with upstream develop
CW-260 Increase text size JS in header , Menu, Newsletter, Publication
Slideshow
CW-260 Increase text size JS in header , Menu, Newsletter, Publication
Slideshow
CW-294 Twin Publications, related wiki
Merge branch 'develop-theme' of https://github.com/EU-OSHA/osha-website.git into develop-theme

Conflicts:
	docroot/sites/all/modules/osha_newsletter/templates/newsletter_body.tpl.php
	docroot/sites/all/modules/osha_newsletter/templates/newsletter_header.tpl.php
	docroot/sites/all/modules/wysiwyg_accordion/js/wysiwyg_accordion.js
	docroot/sites/all/themes/osha_frontend/css/osha_theme_default.css
	docroot/sites/all/themes/osha_frontend/templates/region--header.tpl.php
Thumbs.db in gitignore
Merge branch 'develop' into develop-theme
Merge branch 'develop' of https://github.com/EU-OSHA/osha-website into develop-theme
CW-294 Menu, intro sections links, list news ...
CW-300 Customized search results
Merge branch 'develop' of github.com:/eu-osha/osha-website into develop
Added article_type
Merge branch 'article_type' into develop
Remove Wiki page from Workbench moderation
moved list of highlights to /highlights and show newsletter subscribe block
moved list of highlights to /highlights and show newsletter subscribe block
Merge branch 'newsletter_subscribe' into develop

Conflicts:
	docroot/sites/all/modules/osha/osha_newsletter/osha_newsletter.module
Display settings for news
Merge pull request #232 from EU-OSHA/article_type

Added article_type taxonomy and field on article