moves space escapes to exclusively the display call
Merge branch 'origin/Master-both' of https://github.com/JFrei86/HWServer into origin/Master-both