tune
Merge branch 'master' of https://github.com/ice-blaze/msr

Conflicts:
	Assets/Photon Unity Networking/Demos/Demo2DJumpAndRunWithPhysics/Demo2DJumpAndRunWithPhysics-Scene.unity.meta
	Assets/Photon Unity Networking/Demos/DemoBoxes/DemoBoxes-Scene.unity.meta