fixed small bug in maggs sanity checks
Some changes towards varying permittivity
Merge branch 'master' of github.com:espressomd/espresso into maggs
Added a new correction function for maggs algorithm
Merge branch 'master' of github.com:espressomd/espresso into maggs
Merge branch 'master' of github.com:espressomd/espresso into maggs
First adaptions.
Added suitable TCL command for MEMD with varying epsilon. Documentation still missing.
some changes in the error messages.
Documentation for spatially varying MEMD algorithm.
Merge branch 'maggs' of github.com:fahrenberger/espresso into maggs

Conflicts:
	doc/ug/ug.tex
	src/maggs.c
Resolved a conflict from different computers...
working ScaFaCoS interface
Made code compile with C++ compiler.
Merge branch 'master' into cpp
Some minor changes to maggs communication
Merge branch 'master' of github.com:espressomd/espresso into maggs
Fixed some malloc issues for C++ compiler in #MODES feature
fix feature DIPOLES
Merge branch 'cpp' of github.com:richter-t/espresso into cpp