Merge branch 'master' into christoph's-branch
load-network in include-file
Merge pull request #11 from CSSS2013UrbanMobility/christoph's-branch

Christoph's branch