Removed m-stroming from emails and error notifications in the app.
Updated sort labels.
Merge branch 'development' into staging