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.
Espresso was cloned from github. Then I reverted to the commit of Olaf Lenz dated back to March 8th 2012, with the hash code 3faac07ec595cd1bca6f45c9ee88fbaa4018bd1c
so that I have the original code of release 3.1.0. The reason for this was this was the code we have enriched with our new functionality of object-in-fluid.

Then I started a new branch named espresso-object-in-fluid. I added all the changes, together with the working example located at samples/cell-in-fluidUG. I emphasize, that the binary bondGenerator has to be compiled before you run the tcl script cell-in-fluidUG.tcl.

Good luck with testing. I am often online on skype icimrak.

Cheers.
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 merger to current repo
Just testing how to commit
Hi Axel,

here are the changes due to your suggestions to Ivan:

- changed the code according to extra/ --> fsi/
- added our implementation in the ug (5.4, 13)
- deleted 'upscale' from the imd commands

Hopefully it works, as it is the first time I am using github.

Best regards,
Markus
testing
Merged from Ivan
Merge branch 'master' of git://github.com/espressomd/espresso into object-in-fluid
Some more fixes and lots of comments