renaming to scws.war clarity since this will only contain stock check functionality (formerly xpedx-ws.war)
Merge remote-tracking branch 'upstream/master'