Numerous changes to support AxonNet
Merge branch 'master' of https://github.com/mranzinger/axon