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...
First step in the implementation of Shan-Chen method with MD coupling: structures and functions modified to allow multiple components. So far working/tested only for a single component (see testsuite/sc.tcl. To activate it, #define SHANCHEN <N>, with <N> number of components in myconfig.h
Preliminary implementation of 2components Shan-Chen
preliminary implementation of Shan-Chen-particles coupling
Revised implementation
some bug fixed
fluid velocity initialization fixed
Tentative implementation of the symmetric solvation scheme for shanchen
small bugs fixed