server code
merge
gerge branch 'monsoul' of https://github.com/ludwiksh/Etales-result-viewer
fix
content-type
edit map