Keeping up to date.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Assets/Code/GameManager.cs
	Library/CurrentLayout.dwlt
	Library/assetDatabase3