dev:js,localisator, location map
add some files
merge water.makefile