changed relationship City <-> BaseBoundary to has-a instead of is-a, fixed inheritance of vehicle factory (not only VehicleFactory, but also associated classes) in order to get around injection problems and this strange class hierarchy, added deploy_glassfish.py, abstracted GTFSPublicTransportDataService and adjusted BusSystemCtrl accordingly
Merge branch 'fix_jpa'