a lot of stuff
Merge branch 'master' of https://github.com/maxi-jp/Project_NewDetroit

Conflicts:
	New Detroit Project/Assets/Community Assets/Photon Unity Networking/Resources/PhotonServerSettings.asset