fixed level buttons in level fail scene and cityscape repetition
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
Merge pull request #220 from ebbyw/Ebby

Ebby