updated water room with new objects
Merge branch 'master' of https://github.com/TheSentinel454/vgd_2014

Conflicts:
	Project/NinjaMorph/Assets/Elementals/Media/Terrains/Volcanic Rock.asset
	Project/NinjaMorph/Assets/RAIN/Editor/RAINSettings.asset