Rebase
Issue 2035: Admin notification has subject. Cucumber test.
Issue 3719: Language not visible anywhere
Merge branch 'master' into issue_3719
Making work module consistent
Putting language in the work meta data
Change the code in all the places, Scott. All The Places.
Merge branch 'master' into issue_2035
Cleaning up the mailer a bit
Move colon inside the DT
Merge branch 'master' into issue_2035
Update admin mailer and tests
Merge branch 'master' into issue_2035
Update _work_module.html.erb

Fixed a stray colon.
Merge pull request #854 from scottsds/issue_2035

Issue 2035:  Admin notification message should have the subject in the c...
Merge pull request #1485 from scottsds/issue_3719

Issue 3719: Language not visible anywhere
3176 em dash to colon in people searh name help
3176 Remove help text for people search text and bookmark fields that no longer exist
3176 Tabs ugh
Merge pull request #1625 from sarken/issue_3176

3176 Em dashes to colons in people search name help