merge conflicts...
Merge branch 'master' of https://github.com/Saduras/RocketFight

Conflicts:
	Assembly-CSharp-Editor.pidb
	Assembly-CSharp.pidb
	Assembly-UnityScript-Editor.pidb
	Assembly-UnityScript.pidb
	Assets/Art/Meshes/Character/animatedRockitDude.meta
	Assets/Meshes.meta
	Assets/Photon Unity Networking/DemoBoxes/DemoBoxes-Scene.unity.meta
	Assets/Photon Unity Networking/DemoBoxes/Resources.meta
	Assets/Photon Unity Networking/DemoFriendsAndCustomAuth.meta
	Assets/Photon Unity Networking/Demos/DemoBoxes.meta
	Assets/Photon Unity Networking/Demos/DemoWorker/Art/Character Controllers/Sources/PrototypeCharacter.meta
	Assets/Photon Unity Networking/Demos/DemoWorker/Scripts/Game.meta
	Assets/Photon Unity Networking/Demos/MarcoPolo-Tutorial/Monstergame/Resources.meta
	Assets/Photon Unity Networking/Demos/PUNGuide_M2H/_Tutorial 1.meta
	Assets/Plugins/Metro/Photon3Unity3D.dll.meta
	Assets/Plugins/Metro/Photon3Unity3D.pdb.meta
	Assets/Plugins/WP8/Photon3Unity3D.dll.meta