Added redirect module
Fixed rebase conflict
Updated feature osha after merging the conflict
refs #2641: Added test to replicate the bug
refs #2641: Language en is added by features
refs #2641: Fix language weight so that english is first
Merge pull request #65 from cristiroma/2641_language_prefix_en

refs #2641 language prefix en
Merge branch 'pull_63' into develop
Added media and file_entity modules
Added and applied patch to media module
Added to drushrc media and file_entity modules
Exported file entity fields in osha module