Fixes DSC-728 and DSC-302
Changed message display
Merge branch 'master' into nn-reorder-children2

Conflicts:
	src/banjo/controllers/WorksController.java
Merge pull request #685 from nla/nn-reorder-children2

Fixes DSC-728 and DSC-302