ok
Various fixes
Merge branch 'master' of github.com:piadiribarne/jupibnb

Conflicts:
	app/models/booking.rb
	db/schema.rb