Changes to support the use of pyside instead of pyqt4

	modified:   qtw/ColorBar.py
	modified:   qtw/FitsImageCanvasTypesQt.py
	modified:   qtw/FitsImageQt.py
	modified:   qtw/GingaQt.py
	modified:   qtw/Plot.py
	modified:   qtw/PluginManagerQt.py
	modified:   qtw/QtHelp.py
	modified:   qtw/QtMain.py
	modified:   qtw/Readout.py
	modified:   qtw/example1.py
	modified:   qtw/example2.py
	modified:   qtw/plugins/Catalogs.py
	modified:   qtw/plugins/Contents.py
	modified:   qtw/plugins/Cuts.py
	modified:   qtw/plugins/Debug.py
	modified:   qtw/plugins/Drawing.py
	modified:   qtw/plugins/Errors.py
	modified:   qtw/plugins/FBrowser.py
	modified:   qtw/plugins/Header.py
	modified:   qtw/plugins/Histogram.py
	modified:   qtw/plugins/Info.py
	modified:   qtw/plugins/Log.py
	modified:   qtw/plugins/MultiDim.py
	modified:   qtw/plugins/Pan.py
	modified:   qtw/plugins/Pick.py
	modified:   qtw/plugins/PixTable.py
	modified:   qtw/plugins/Preferences.py
	modified:   qtw/plugins/Ruler.py
	modified:   qtw/plugins/Thumbs.py
	modified:   qtw/plugins/WBrowser.py
	modified:   qtw/plugins/Zoom.py
	modified:   qtw/tests/cbar_test.py

- changes QtHelp module to allow the use of PyQt4 api #2 or pyside
Merge branch 'master' into pyside

Conflicts:
	qtw/FitsImageQt.py
	qtw/QtHelp.py
	qtw/plugins/Debug.py
	qtw/plugins/FBrowser.py
	qtw/plugins/Histogram.py
	qtw/plugins/Info.py
	qtw/plugins/Log.py
	qtw/plugins/Pan.py
	qtw/plugins/Pick.py
	qtw/plugins/PixTable.py
	qtw/plugins/Preferences.py
	qtw/plugins/Thumbs.py
	qtw/plugins/Zoom.py
Merge branch 'master' into pyside

Conflicts:
	qtw/FitsImageQt.py
	qtw/GingaQt.py
	qtw/PluginManagerQt.py
	qtw/QtHelp.py
	qtw/plugins/Catalogs.py
	qtw/plugins/Contents.py
	qtw/plugins/Cuts.py
	qtw/plugins/Drawing.py
	qtw/plugins/Errors.py
	qtw/plugins/Header.py
	qtw/plugins/MultiDim.py
	qtw/plugins/PixTable.py
	qtw/plugins/Preferences.py
	qtw/plugins/Ruler.py
	qtw/plugins/WBrowser.py
Fixes necessary to run Ginga using PySide OR PyQt4

	modified:   PythonImage.py
	modified:   ginga.py
	modified:   qtw/FitsImageQt.py
	modified:   qtw/QtHelp.py
	modified:   qtw/example1.py
	modified:   qtw/example2.py
	modified:   qtw/plugins/Catalogs.py
	modified:   qtw/plugins/Cuts.py
	modified:   qtw/plugins/Drawing.py
	modified:   qtw/plugins/FBrowser.py
	modified:   qtw/plugins/Histogram.py
	modified:   qtw/plugins/MultiDim.py
	modified:   qtw/plugins/Pan.py
	modified:   qtw/plugins/Pick.py
	modified:   qtw/plugins/PixTable.py
	modified:   qtw/plugins/Preferences.py
	modified:   qtw/plugins/Ruler.py

- choice is made in mode qtw/QtHelp.py
  - will default to trying to import PyQt4 and failing over to PySide
Fixes to get Ginga to run with Gtk/PyQt/PySide

	modified:   gtkw/FitsImageGtk.py
	modified:   gtkw/plugins/Pan.py
	modified:   qtw/FitsImageQt.py
	modified:   qtw/QtHelp.py
	modified:   qtw/plugins/Catalogs.py
	modified:   qtw/plugins/Cuts.py
	modified:   qtw/plugins/Drawing.py
	modified:   qtw/plugins/FBrowser.py
	modified:   qtw/plugins/Histogram.py
	modified:   qtw/plugins/Log.py
	modified:   qtw/plugins/Pan.py
	modified:   qtw/plugins/Pick.py
	modified:   qtw/plugins/PixTable.py
	modified:   qtw/plugins/Preferences.py
	modified:   qtw/plugins/Thumbs.py

- added custom cursor to work around a problem of segfault in pyside
  - cursors now should look the same across platforms
Fixes for loading standard bitmap images

	modified:   PythonImage.py
	modified:   qtw/GingaQt.py
	modified:   qtw/PluginManagerQt.py
	modified:   qtw/QtHelp.py

- fixed a bug with loading bitmap images from a QImage (pyqt/pyside issue)
- added support for reading an embedded color profile and converting to
    a working profile