fixed end scene
Merge branch 'master' into Ebby

Conflicts:
	Assets/Scenes/Level7-Beach.unity
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
making sure end scene works
Merge pull request #221 from ebbyw/Ebby

Ebby