Merge branch 'master' of https://github.com/cwmaia/Seatours.Meteor

Conflicts:
	client/views/book/book_operator.html
	server/publications.js
Refine Trip model and add select trip on Booking page