Merge branch 'wip'
Fix network model

resolves #80
Merge branch 'wip'
Merge branch 'master' of https://github.com/munkireport/munkireport-php into bisd-development

# By Arjen van Bochoven
# Via Arjen van Bochoven
* 'master' of https://github.com/munkireport/munkireport-php:
  Fix network model