* Unified redundant DEB_ERROR/THROW_CTL_ERROR pairs
* Reorganised and extended RoiCounter & Roi2Spectrum SoftOps:
  + Unified interface for named rois
  + Added methods for retreiving configured RoIs (including ARC)
  + Renamed methods to improve uniformity in nomenclature
* Extended the Simulator FrameBuilder to tomography & diffraction apps:
  + Added new Diffraction image fill_type, which creates a ring-like pattern;
    the previous fill_type is now called Gauss
  + Added support to 3D (gaussian) features in cylindrical coordinates
  + Allow translation and/or rotation of the peaks during acquisition,
    simulating pencil mapping, tomography and helical scans
git to cpp tango server

Conflicts:
	applications/tango
Merge branch 'master' of github.com:esrf-bliss/Lima

Conflicts:
	applications/tango
* Protect against Python imports of binary incompatible dependencies
* Updated Simulator and Espia to v1.3.0
* Switched to processlib-1.3.0
* Added gldisplay submodule, just copied from Bliss common drivers for Espia
* First version of GLDisplay for Lima using the Simulator and SPS display (C++)
* Added GLDisplay to Lima build/install machine, including SIP
* Prepared GLDisplay for public access
* Explicitly check for SPS build option if GLDisplay is included
Added xspress3
Merge pull request #18 from goeff
* With Tiago Coutinho: ported GLDisplay to Qt4
* Added GLDisplay window read/write parameters:
  update/refresh rates, intensity [auto-]normalization. test image activ.
* Splited SPS Local and Forked displays as subclasses of same abstract class
* Implemented SPS Forked window control using SimplePipe's
Add rayonixhs into Makefiles
* Completed SIP Python wrapping for existing GLDisplay classes
* Added very simple Python Simulator GLDisplay test, included in README