* 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
Merge branch 'master' of github.com:esrf-bliss/Lima

Conflicts:
	applications/tango