datatypes...
Merge branch 'master' of https://github.com/portalmod/mod-sdk

Conflicts:
	html/js/common.js
	html/js/modsdk.js
	html/js/wizard.js