commiting before merge
Merge remote-tracking branch 'origin/Taylor10-7-2014' into iago-programming

Conflicts:
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assets/Scenes/Main - Lives.unity
	Assets/Scenes/Main - tghocutt.unity
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/b9/b9484a0ade2dcfe49830af313250c3ce
	Library/metadata/da/da75cc62cdbce4855bbeb48963d3c20f
	Library/metadata/ea/eaa94e92486cf4fbba639daba2e725e3
	Library/shadercompiler-1.log