Sprites On

Sprites on new objects Player 1 and Player 2
Merge branch 'master' of https://github.com/IAmTipsy/DungerMan

Conflicts:
	DungerMan/DungerMan.userprefs
	DungerMan/Library/CurrentLayout.dwlt
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll
	DungerMan/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DungerMan/Library/assetDatabase3
	DungerMan/Library/guidmapper
	DungerMan/Library/metadata/2a/2af574102e7334116a50a7d2f9b32c5f
	DungerMan/Library/metadata/a8/a8ce6eece896c4baf90727a6cfe71594
	DungerMan/Library/metadata/aa/aa0aad0fd0f464c6ba909571f658d28c