Merged changes from org.matsim.contrib.grips in cooperation with wdoering
Authored by: hubertkluepfel 2014-02-06
Parent: [r27845]
Child: [r27847]