fixed bug in setup
Merge branch 'master' into devGUI
fixed setup.py
Merge branch 'devGUI' into PySide