Commit.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
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