added servlet-dependency
added locale status code fix
Merge branch 'master' of https://github.com/syncnapsis/syncnapsis-universe-conquest