Fix build process on Linux and Mac OSX
Merge branch 'code-refactoring' of https://github.com/pgmodeler/pgmodeler into code-refactoring