Fixed
Harness added
Merge remote-tracking branch 'tdengine/master' into alpha

Conflicts:
	modelview.cc
Merge remote-tracking branch 'tdengine/master' into alpha

Conflicts:
	makefile
	modelview.cc
Integrated this too