Fix merge issue that removed all staff from developer branch :-).
refs #1015: fix ordering in messages grid
Undo my stupid mistake (I have pushed issue-957 to master instead of develop). Do I have copied files from GitHub master and push them back..
Merge from SVN branch 1.2.
Merge from SVN trunk.
Release 1.1.0
Release 1.0.0