ChapterTwo-12: Refactore Voyage to use VoyageNumber as string internally
Merge branch 'ChapterTwo-12' into development