Merge branch 'dev' into images
Fixed: Select and Multi-Select of nodes, links and sensors
Merge branch 'images' into dev