Haste cap
Merge branch 'master' of https://github.com/notagain/DatankCore

Conflicts:
	Build/revision.h