Merge branch 'HOTFIX-438-node-url-translation'
Merge branch 'HOTFIX-438-node-url-translation'
cw-324 Add blocks inside content
cw-324 Disable the possibility to add blocks inside content
Add redirects /view for files and publications
add email field
enable email contrib module
press contact content type - new feature
update fields and enable press contact feature
CW-333 - add press contact content type, press contacts block and press contact administration interface
Merge pull request #292 from rciofringeanu/cw-324-vacancies-dev

cw-324 Add blocks inside content
Merge remote-tracking branch 'origin/HOTFIX-migration' into develop

Conflicts:
	docroot/sites/all/modules/osha/osha_migration/files.migrate.inc
Merge pull request #296 from claudiaifrim/CW-333_press_contacts

Cw 333 press contacts
Enabled vacancies blocks
Merge branch 'release-R1-bugfix-S4' into develop
add on_the_web contrib module
enable on_the_web contrib module @install
configure links for Twiter, Facebook and Flikr
update press contacts administration view
add note to editor content type