Fixed merge conflict
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Assembly-CSharp-vs.csproj
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
Merge pull request #24 from Kierz/master

Merge #8