Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project 1/Library/CurrentLayout.dwlt
	New Unity Project 1/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project 1/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project 1/Library/assetDatabase3

ja

Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity
Project 1/Library/CurrentLayout.dwlt
	New Unity Project
1/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project
1/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project
1/Library/assetDatabase3

doors
Merge branch 'master' of https://github.com/tiduse22/PrisenEscapeUnity