Lukasz Faber's patch, simulation params name changed, error fix:
conservative force factor read for dissipative force.
Merge branch 'simons' of https://github.com/domjullier/dpd_simulation into simons

Conflicts:
	DPD_main.py