Unity 4.6 BETA 19 conversion! be carefully moth****s
Merge branch 'master' of https://github.com/maxi-jp/Project_NewDetroit

Conflicts:
	New Detroit Project/Assets/Community Assets/Photon Unity Networking/Resources/PhotonServerSettings.asset
	New Detroit Project/Assets/NewDetroit/Scenes/NewDetroit01_Jacob.unity
	New Detroit Project/Assets/Standard Assets/Water (Pro Only)/Water4/Sources/Materials/Water4Example.mat
	New Detroit Project/UnityVS.New Detroit Project.v11.suo
	New Detroit Project/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache