More javadocs
Merge branch 'TourApi' of https://github.com/MCME/Tours into TourApi