Merge pull request #71 from solispauwels/master

Icon and platform name administration + GUI update
Merge remote-tracking branch 'upstream/master'