Fixing conflicts

CMakeLists.txt

Makefile.am

configure

src/CMakeLists.txt

src/Draw/DrawSphere.hpp

src/FiniteDifference/FDScheme_unit_tests.cpp

src/FiniteDifference/FD_expressions.hpp

src/FiniteDifference/FD_op_Tests.cpp

src/FiniteDifference/FD_order1.hpp

src/FiniteDifference/FD_simple.hpp

src/FiniteDifference/Upwind_gradient.hpp

src/FiniteDifference/tests/Eno_Weno_unit_test.cpp

src/FiniteDifference/tests/FD_order1_unit_test.cpp

src/FiniteDifference/tests/FD_simple_unit_test.cpp

src/FiniteDifference/tests/Upwind_gradient_unit_test.cpp

src/Makefile.am

src/Matrix/SparseMatrix.hpp

src/Operators/Vector/cuda/vector_dist_operators_cuda.cuh

...erators/Vector/tests/vector_dist_operators_tests_util.hpp

src/Operators/Vector/vector_dist_operators.hpp