Migration to OL3
proxy for hydro data
adding info on storymap4
conflict in README
Merge branch 'migration_storymap4'