Adding BOM in Navy, on the server
Merge remote-tracking branch 'upstream/master'
Merge pull request #18 from uipo/master

Navy in Server changed