Fixed setup.py
Merge branch 'devGUI' into PySide