Merge remote-tracking branch 'origin/master' into securitywidget
Start style plugin
Merge branch 'securitywidget' of github.com:Heigvd/Wegas into securitywidget
Remove wegas-app src setup
Continue cssStyle plugin
Resolve conflict
websocket + plugin css
Resolve conflict
Merge remote-tracking branch 'origin/master' into securitywidget