refs #2655: Fix Collapsible 'if' statements should be merged
refs #2613 - Enable language switcher in deployment profile
refs #2654: refactored Publications migration
refs #2654: refactored News migration
refs #2654: Now test.sh detects tabs
refs #2655: Fix Local variables should not have the same name as class fields
Merge pull request #71 from claudiaifrim/ticket_2613

refs #2613 - Enable language switcher in deployment profile
Fixed apachesolr module name - disabled when running tests to avoid indexing test items
Merge branch 'develop' of https://github.com/eu-osha/osha-website into develop
Merge pull request #73 from razvan-tache/task_2655

Task 2655
Merge branch '2654_refactor' of github.com:eugenst/osha-website into eugenst-2654_refactor

Conflicts:
	docroot/sites/all/modules/osha_migration/content.news.migrate.inc
	docroot/sites/all/modules/osha_migration/content.publications.migrate.inc
Merge branch 'eugenst-2654_refactor' into develop
refs #2604 - add tinymce 3.5.11 - sources
Merge pull request #75 from claudiaifrim/ticket_2604

refs #2604 - add tinymce 3.5.11 - sources