Update build.py to use new Xnt
Merge Changes (resolve Conflicts)

Conflicts:
	report/build.py