OceanClass and TestOcean.aspx.cs

Added methods to oceanclass and edited methods in the testocean page
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestOcean.aspx
	TestOcean.aspx.cs