Merge remote branch 'origin/master'

* origin/master:
  fixed submodule to point to soleil-ica instead of esrf-bliss (thanks to SP)
Merge remote branch 'origin/master'

* origin/master: