update todo
manual merge failed

Merge branch 'master' of https://github.com/landroni/gWidgets2-filter

Conflicts:
	TODO
manual merged failed again

Merge branch 'master' of https://github.com/landroni/gWidgets2-filter

Conflicts:
	TODO