Added redirect module
Fixed rebase conflict
Updated feature osha after merging the conflict
Merge branch 'pull_63' into develop