Fixed ServerTest Servlet
made some changes in update engine
finished scaling
Merge branch 'mapSangraama' of https://github.com/Sangraama/sangraama-server into mapSangraama