anges
Merge branch 'master' of github.com:blegat/LFSAB1507

Conflicts:
	matlab/testBlurDeblur.m