Merging with master Conflict resolution

.gitignore

.gitmodules

CHANGELOG.md

Makefile.am

build_pdata.sh

configure.ac

example/Grid/0_simple/main.cpp

example/Grid/1_stencil/main.cpp

example/Numerics/Makefile

example/Numerics/PSE/0_Derivative_approx_1D/Makefile

example/Numerics/PSE/0_Derivative_approx_1D/main.cpp

example/Numerics/PSE/Makefile

example/SE/0_classes/Makefile

example/SE/0_classes/config.cfg

example/SE/0_classes/main.cpp

example/SE/1_classes/Makefile

example/SE/1_classes/config.cfg

example/SE/1_classes/main.cpp

example/SE/Makefile

example/VCluster/0_simple/Makefile