Merge cbt/master

Conflicts:
	application/models/stadium_model.php
Merge cbt/master