Fixed wrong commit
Merge branch 'master' of https://github.com/the-wolf/PSE-Moleculardynamics

Conflicts:
	src/container/LinkedCellContainer_3.h