Latest changes
Latest changes
Merge branch 'master' of https://github.com/WingsProject/Redbull

Conflicts:
	core/classes/booking.php