Add Fahrplan apps.
Cleaned up a few links
merged johnjohndoe-patch-1
Merge branch 'johnjohndoe-patch-1'