Merge branch 'christoph's-branch'
Merge branch 'christoph's-branch'
added netlogo file with load-network routines
Merge branch 'master' of https://github.com/CSSS2013UrbanMobility/UrbanMobility into christoph's-branch