...
Merge https://github.com/dasistwas/moodle-mod_booking

Conflicts:
	lib.php