Merge of onebusaway-app-mods camsys with onebusaway-app-mods master