Merge branch 'master' into develop
Conflicts:
Benchmarks/ChiBenchmark/Makefile.GPU.intel
Benchmarks/ChiBenchmark/chi_CPU.cpp
Benchmarks/ConfigFiles/90Pot.par
Benchmarks/GridGradient2Benchmark/GridGradient_CPU
src/Makefile.GPU.intel
src/grid_gradient_GPU.cu
Former-commit-id: 618cf4731c029001ef7ce75c0f8edc02021122bd