set machine name in layout
rm
various fixes
Merge remote-tracking branch 'origin/develop' into 285-to-or-from-address-is-2-lines
Merge pull request #160 from CG-CamSys/various-fixes

Various fixes