Editing TODO file
Merge branch 'devel' into coulomb

Conflicts:
	src/ddMd/TODO