Fixed Here doc format
Added some goals in TODO
Merge branch 'develop'

Conflicts:
	TODO.txt