for the merge with Jerome
Merge remote-tracking branch 'jerome/master'

Conflicts:
	openCL/image.cl
	test/test_image.py
Merge branch 'master', remote branch 'origin'
local workspace in orientation
Merge remote branch 'pierre/master'
orientation assignment is wrong
merged branches
merge conflicts
non working
Merge branch 'master', remote branch 'origin'