Removed bidisperse system assumption in Simulation class
Merge remote-tracking branch 'origin/master'

Conflicts:
	LF_DEM/Interaction.cpp
	LF_DEM/Simulation.cpp
	LF_DEM/System.cpp