fixing navi look
adding exception serialization support
server.jag added
Merge remote-tracking branch 'upstream/master'