Merge remote-tracking branch 'origin/Frontend' into Backend

Conflicts:
	js/functions.js
	views/bookings/edit_date.php
	views/header.php