Added float and int
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity Project/Assets/Assets/Code/Core/EngineCore.cs.cs