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.
extended lattic struct for anisotropy.
extended lattice!
...
...
new code for the lattice and the potential!
Check validity of features.
added new slitpore constraint
Merge branch 'master' of github.com:kessel/espresso
minor improvments to different dielectric things
minor improvments to different dielectric things
fixed small error
Merge branch 'master' of https://github.com/kessel/espresso

Conflicts:
	src/iccp3m.c
added iccp3m subcommand no_iterations