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...
Some minor changes to maggs communication
Merge branch 'master' of github.com:espressomd/espresso into maggs
ljgen_tcl.c softcore
Added LJGEN_SOFTCORE
Updated UG for LJGEN_SOFTCORE
LJGEN_SOFTCORE: fixed initialization of lambda and delta var
LJGEN_SOFTCORE: corrected Tcl output
Merge branch 'master' of github.com:espressomd/espresso into maggs