Changed code structure to help QtCreator
Fixed Qt Project files, now compiling
Merge branch 'master' into logictree
updated the branch to work in qtcreator