todo updates
Merge branch 'master' of https://github.com/jeske/SimpleScene

Conflicts:
	WavefrontOBJViewer/TODO.txt