Fixes
Merge branch 'demo' of https://github.com/Shipyards/Naval-Knockout into demo
Merge branch 'demo' of https://github.com/Shipyards/Naval-Knockout into demo