Merge branch 'master' of
https://github.com/domjullier/dpd_simulation.git into nonOO

Conflicts:
	viz/vizer.py
old outputformat added again