Merge remote-tracking branch 'origin/master'

Conflicts:
	Assembly-UnityScript-Editor.unityproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Cenas/level1.unity
	Assets/Prefabs/Personagem.prefab
	Assets/Scripts/Jogador.cs
	Assets/TouchScript.meta
	Assets/TouchScript/Plugins/TouchScript.dll.meta
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	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-Editor.dll
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000002000000000000000
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/00000000000000004100000000000000
	Library/metadata/00/00000000000000005000000000000000
	Library/metadata/00/00000000000000005100000000000000
	Library/metadata/00/00000000000000006000000000000000
	Library/metadata/00/00000000000000006100000000000000
	Library/metadata/00/00000000000000007000000000000000
	Library/metadata/00/00000000000000008000000000000000
	Library/metadata/00/00000000000000009000000000000000
	Library/metadata/00/0000000000000000a000000000000000
	Library/metadata/00/0000000000000000c000000000000000
	Library/metadata/1a/1af1b7ab30830ac4bab57c8f0b03c247
	Library/metadata/20/20c2a163775f09b4cafa29b19d0c9204
	Library/metadata/23/2329e6aba4b977e4182250b1ee2d3185
	Library/metadata/4a/4a78d7d23f5d7b64ab9fddadf44a5dc8
	Library/metadata/4b/4bbd764bf2f111f4aaef35978b4fa6c6
	Library/metadata/4c/4c6c415254725494bab8115c800942a8
	Library/metadata/58/58308089b65d2402db691fcd9ebe2c59
	Library/metadata/69/69b690a7cc9907348bb31cbf2711f155
	Library/metadata/6b/6b427feebf1464d7e9581f02828a4dcc
	Library/metadata/6e/6e5cb7f2dd869424f858e2eb3b282deb
	Library/metadata/71/714ac7d90d1cf3e4996b78ac1c4ec2d7
	Library/metadata/97/975fc4711662b3741868e541f5bc51a2
	Library/metadata/97/97c5dc57803c2324a9b055ddbc88ed53
	Library/metadata/a8/a8366d968ed52c943a1cedef438e1423
	Library/metadata/b6/b69d121225efd224a87082b58a50c8e9
	Library/metadata/c3/c3a64969d73167d44ab83d515def5ddf
	Library/metadata/d9/d97a901932b0ccd4aac99227707fc342
	Library/metadata/f0/f09a8006afe50174ca15100dbf385693
	Library/metadata/f6/f6328749af4874b89b20b312a415c941
	Library/shadercompiler-1.log
	O-Guardiao.userprefs