Spike sorting fix

[juliencarponcy]

I have reverted to commit before my manual merge in a new spike_sorting_fix branch

I merged the dev branch onto it

Then took my latest changes in spike_sorting to spike_sorting_fix

Now merging back the fusioned branch to original spike_sorting branch in order to ease PR to dev branch