Fix for #1567
Fix merge conflicts
Fix merge conflicts
Merge pull request #1616 from juancarlospaco/fix/preferences_editor

Fix for #1567
opaque split resize false, reload files
Merge remote-tracking branch 'upstream/master'
improves in spacing and styling of qgroupbox
Merge pull request #1617 from diegosarmentero/master

Reload File and style improves