Merge pull request #61 from Jailander/hydro-devel

quick fix
Adding map server