Fixes for svy21 conversion.
Merge branch 'Cam'

Conflicts:
	SVY21Extractor/src/net/qxcg/cycling/Extractor.java