Some refactor and cleaning in the gui project
Merge branch 'dev'
Merge pull request #24 from pnagy/master

Some refactor and cleaning in the gui project