Commit before merging.
Merge remote-tracking branch 'origin/master'

Conflicts:
	LF_DEM/Interaction.cpp
	LF_DEM/Simulation.cpp
	LF_DEM/generateYaplotFile.pl
Commit before remote merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	LF_DEM/Interaction.cpp
	LF_DEM/Simulation.cpp
	parameter_template.txt