Commit.
Fix of some volume controls.
Fixed a couple bugs
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
Rock camera now resets properly after gettign a new rock, also made the player switch teams after firing and only fires their own teams rocks
wasting my time on git again