FIX for issue 963, Add html_safe and fix spelling errors
Resolved conflicts during merge
Merge pull request #970 from m-bodmer/issue963

FIX for issue 963, Add html_safe and fix spelling errors
Closes #963
FIX for issue 994, Add html_safe and fix incorrect grammer in locale files
Merge pull request #995 from m-bodmer/issue-994

Issue 994 : Add html_safe and fix incorrect grammer in locale files
Closes #994
Merge branch 'master' of github.com:benjaminvialle/Markus into machinist2