Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 3 Feb 2017 15:11:42 +0000 (16:11 +0100)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 3 Feb 2017 15:11:42 +0000 (16:11 +0100)
commita6ce6f3c00d8d4ae7d378da7ddc6feccf9a38477
tree6e8c1616925add36676659fc43b5f92d06802be4
parent8eac3cc3f7f58f7490ab6714217d985b8992af70
parentc46fe93dd3f79a91ce86baf933282aa25ff76ddc
Merge remote-tracking branch 'upstream/master'

solve Conflicts:
src/emuvim/api/rest/monitor.py
src/emuvim/api/rest/network.py
dashboard/README.md
dashboard/css/main.css
dashboard/img/SONATA_new.png
dashboard/index.html
dashboard/js/main.js
dashboard/son-emu-dashboard-screenshot.png
misc/sonata-stress-service.son
src/emuvim/api/rest/compute.py
src/emuvim/api/rest/monitor.py
src/emuvim/api/rest/network.py
src/emuvim/dcemulator/net.py