Merge branch 'christoph's-branch'
set colours for the transit lines, added length field for transit and road segments
set colours for the transit lines, added length field for transit and road segments, no. 2
Merge branch 'master' into christoph's-branch
Merge branch 'christoph's-branch'
Merge branch 'master' of https://github.com/CSSS2013UrbanMobility/UrbanMobility into christoph's-branch
Merge branch 'christoph's-branch'