Merge branch 'master' of https://github.com/hmenke/espresso
Merge remote-tracking branch 'upstream/master'
MMM1DGPU skeleton
Mmm1dgpu working
MMM1DGPU force reduction
MMM1DGPU: Proper CUDA block size. Self-destruct if coulomb method is changed.
Merge branch 'master' of https://github.com/espressomd/espresso into mmm1dgpu

Conflicts:
	src/Makefile.am
	src/core/forces.cpp
Make MMM1DGPU work again after b3fdafb9
Make changing MMM1DGPU parameters work
MMM1DGPU fetch current parameters
MMM1DGPU tuning: Can now tune multiple times, don't add to forces
MMM1DGPU: Make sure inter coulomb always returns the current parameters
Merge remote-tracking branch 'espresso/master' into mmm1dgpu
EspressoSystemInterface: energy calculation
Fixed warning
Fixed documentation of integrate command
Make lj-gen beahave more correctly if cap radius is not set and exponents are negative.
MMM1DGPU testcase and one discovered bug fixed
In case of NaN forces, tell which particle caused the error.
Merge remote-tracking branch 'upstream/master'