Merge cbt/master

Conflicts:
	application/views/stadium_view.php
Merge cbt/master

Conflicts:
	application/views/stadium_view.php
Merge cbt/master

Conflicts:
	application/views/stadium_view.php
Merge cbt/master

Conflicts:
	application/models/booking_model.php