Check validity of features.
Made code compile with C++ compiler.
Merge branch 'master' into cpp
Fixed some malloc issues for C++ compiler in #MODES feature
fix feature DIPOLES
Merge branch 'cpp' of github.com:richter-t/espresso into cpp
removed "deprecated warnings" when switching on debug in c++ compiler
Got LB working with C++ compiler
C++ compiler fixes in lbgpu
Merge branch 'master' of github.com:espressomd/espresso into cpp

Conflicts:
	src/tcl/angle_cossquare_tcl.h
	src/tcl/angle_harmonic_tcl.h
	testsuite/configs/myconfig-maxset.h
fixed CUDA and C++ linking
Merge branch 'master' into cpp

Conflicts:
	src/lb-boundaries.c
	src/reaction.c
C++-ed halo
Built in C++ into the build system
Fixed merge conflict
Merge remote-tracking branch 'jdegraaf/bug_hunt' into electrokinetics
Added electrokinetic to features.def
bootstrap.sh can be run from build dir, dielectric.tcl no longer crashes make check, seg fault caused by lack of args in lbnode now checked
new combined bootstrap and configure
First steps of merging electrokinetics into master.  Still lacks interface and not tested