Separate SearchTourForm from TourInfoSearchCriteria #133

cherry-pick from master branch.
Please review #133 , and merge to 1.0.x branch.

db46acc917210198729c9875a5f91fcaff02533c