Correctly switching between polling/websockets
Font size plugin i18n
Merge remote branch 'upstream/development' into europnet
Color picker fixes