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

Conflicts:
	client/views/book/book_operator.html
Merge branch 'master' of https://github.com/cwmaia/Seatours.Meteor
Add blocking dates
Conflicts:
	client/views/trips/trips.js
	server/publications.js