Moving resources to /gui/resources
Merge remote-tracking branch 'origin/master'