Merge pull request #23 from floorman/master

Bug fix and optimisations
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
Merge pull request #24 from Kierz/master

Merge #8
Fix of a player preferances file fix for volume.
Revert to old commit.
Working on rock firing
Working on rock firing
Merge pull request #26 from Kierz/master

Merge #9
Stashing
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3