update line function and prefab
Merge branch 'master' of https://github.com/Lifespark/LifeSparkDev

Conflicts:
	LifeSpark/Assets/Photon Unity Networking/Resources/PhotonServerSettings.asset
	LifeSpark/Assets/_Scripts/Managers/MasterManager.cs
	LifeSpark/Assets/_Scripts/SparkPoint.cs