Assets
Merge branch 'master' of https://github.com/ourmark/hermanosdesangre

Conflicts:
	public/assets/manifest-6e7bc11d8c966fc2c4f925140f202c9a.json
Merged
Bookings day mostly done
Dates on psql
Fixed query
Changed relationship