Fixed Fwhm bpm
Merge git://github.com/esrf-bliss/Lima

* git://github.com/esrf-bliss/Lima:
  Fixed Fwhm bpm

Conflicts:
	third-party/Processlib