Added player particles
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Dev.unity
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/InspectorExpandedItems.asset
	Library/ProjectSettings.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/metadata/26/265d07e0cad881046a30db3e7c25090c
	Library/metadata/56/56f33e846b9da0641a75f3c4d9deb2ab
	Library/metadata/ce/cea9f8073e2adcd428e42fe0205a9d3c
	Library/metadata/e6/e6a6869576f6d374e8bafc0cb89b7bfb
	ProjectSettings/ProjectSettings.asset