Removed TestingCanvas
Testing some network drawing
Just small tweaks
Merged branches
Merged in networktesting