Commited changes made by drush feature-update (which re-ordered the generated code)
refs #2674: Add test for unique terms returned by the old -> new category mapping
refs #2674: Fix the bug where not unique values would be returned
Updated all features with scs (simple content selection) additions
Merge pull request #84 from razvan-tache/task_2674

refs #2674: Test and fix for the bug
refs #2679: Write tests for term language
refs #2679: Set language english for migrated terms
refs #2607: Removed action, results, organization (see specs)
Merge branch 'develop' of https://github.com/eu-osha/osha-website into develop
Merge pull request #85 from razvan-tache/task_2679

refs #2679: Tests and fix for the bug
refs #2652: Corrected site_name/temporary configuration (they are simple variables)
refs #2652: Added help text for term autocomplete, to indicate comma separator
refs #2652: Added admin_views to override admin/content. Added filtering by node title
refs #2652: Reviewed field order
refs #2652: NACE codes migration preserves taxonomy codes in URL
Merge branch '2652_demo1_bugs' of https://github.com/eu-osha/osha-website into 2652_demo1_bugs