fixed #3
Merge branch 'feature/3-server-without-gui-commons' into dev