Merge branch 'printpage'
Use modal dialog to show help for form fields
Merge branch 'master' into wmplus
Get rid of stuff that belongs only in wmplus branch
Fix style for help modal
Merge branch 'master' into testing
Merge branch 'testing' into wmplus
Undo some merges