time shift test
Merge branch 'commit_test' of https://bitbucket.org/icarus/dnf-laravel into commit_test

Conflicts:
	application/controllers/booking.php