Merge pull request #27 from Kierz/master

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

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
Hopefully fixed menu items for the last time.
Added SetFriction to gamemanager, access via Singlton