* Remove obsolete cyborg templates
Merge branch 'removeCyborgTemplates'

Conflicts:
	TODO.txt