fix maven dependencies and ws
Merge remote-tracking branch 'origin/fix_ws'