Update Type.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/Class/Type.js