added water tank to water room, removed pond with crates
Merge branch 'master' of https://github.com/TheSentinel454/vgd_2014

Conflicts:
	Project/NinjaMorph/Assets/Oil Tank/Materials/Oil Tank-Material__Untitled.tga.mat