Fixed case SVY-7264
Fixed SVY-7199 : Servoy Developer wrong i18n messages parse if there an
orig file
Merge remote-tracking branch 'origin/master'
SVY-6929 Moved websocket.js to sablo project
Merge remote-tracking branch 'origin/master' into SVY-6929