updated todo
Merge branch 'release-v1.2' of https://github.com/florentpoujol/Daneel into release-v1.2

Conflicts: (resolved)
	TODO.txt