changed asset serialization to text
Merge remote-tracking branch 'origin/Jody' into Adam

Conflicts:
	DDD/ProjectSettings/InputManager.asset
Merge remote-tracking branch 'origin/Adam' into Jody

Conflicts:
	DDD/Assets/-tk2d.asset
	DDD/Assets/Scene/terrain.asset
	DDD/Assets/Standard Assets/Terrain Assets/Trees Ambient-Occlusion/Palm/Materials/palmbark.mat
	DDD/Assets/Standard Assets/Terrain Assets/Trees Ambient-Occlusion/Palm/Materials/palmbranch.mat
	DDD/ProjectSettings/InputManager.asset
push