add noise modes
add water map
Merge branch 'master' of https://github.com/mirreck/my4x.git

Conflicts:
	my4x-map/src/main/java/net/my4x/services/map/MapTileServiceImpl.java
	my4x-map/src/main/java/net/my4x/services/map/model/HeightMap.java
	my4x-webapp/src/main/webapp/resources/js/modules/module2.js