Merge branch 'gui-devel' of C:\Projects\webofneeds with conflicts.
Content for all messages types prepared (not styled).