Added MEMD to the example script.
Added MEMD part to the electrostatics tutorial.
user guide: fix setup of com virtual sites
Merge pull request #114 from ottxor/master

user guide: fix setup of com virtual sites
Docfix.
Merge branch 'master' of github.com:espressomd/espresso
Skip MPICH C++ bindings.
Removed unnecessary ';'.
new object-in-fluid functionality
Merge pull request #115 from olenz/master

Removed unnecessary ';'.
Merge branch 'master' of git://github.com/espressomd/espresso

Conflicts:
	scripts/object_in_fluid.tcl
Merge remote-tracking branch 'upstream/master' into workingBranch