Merge remote-tracking branch 'origin/master' into projectile

Conflicts:
	Assets/Scenes/TestScene.unity
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/06/0680c2e95a897e8469f9c04369cab194
	Library/metadata/43/436ede1c61e58f54ea174ad0b6d80b52
	Library/metadata/af/af23e14fddca6044a94a494dc4dd8702
	Library/metadata/f2/f2d85546877ae5246a7706aff3a0b768
	TienJam-csharp.sln
	TienJam.sln
	TienJam.userprefs