pulling develop
pulling develop into router feature
prepping for merge to develop
version 0.7

Merge branch 'develop' of https://github.com/zatricion/NetSim into develop