Added Water and WaterView classes
Added .project, .classpath
Resolved .classpath differences with master