Merge branch 'master' of ssh://git.mpi-cbg.de/openfpm/openfpm_data

src/Grid/cuda/map_grid_cuda_ker.cuh

src/Grid/grid_base_implementation.hpp

src/Grid/grid_sm.hpp

src/Grid/map_grid.hpp

src/NN/CellList/CellListIterator_test.hpp

src/SparseGrid/SparseGrid_conv_opt.hpp

src/SparseGrid/SparseGrid_iterator_block.hpp

src/Vector/cuda/map_vector_cuda_ker.cuh

src/Vector/vector_test_util.hpp

src/config/config_cmake.h.in

src/main.cpp

src/unit_test_init_cleanup.hpp

src/util/cuda/segreduce_ofp.cuh