GUI: Button-Margin changed; Converted line-endings to LF
Merge remote-tracking branch 'origin/master'