Allowing for OBA GTFS-R extensions
Merge branch 'master' of https://github.com/PTIPS/GTFS-tests.git

Conflicts:
	pom.xml
	src/main/java/au/gov/nsw/rms/gtfs/support/GtfsFeed.java
Merge branch 'master' of https://github.com/PTIPS/GTFS-tests.git

Conflicts:
	src/main/java/au/gov/nsw/rms/gtfs/support/GtfsFeed.java