cancel booking
Merge branch 'master' of https://github.com/randyibarrola/active

Conflicts:
	templates/newdesing/images/cancel-booking.png