Merge branch 'master' of ssh://c4science.ch/diffusion/1448/lenstool-hpc
Conflicts:
Benchmarks/ChiBenchmark/Makefile.GPU.intel
Benchmarks/ChiBenchmark/chi_CPU.cpp
src/Makefile.GPU.intel
src/Makefile.intel
src/gradient_GPU.cu
src/grid_gradient_GPU.cu