Merge cbt/master
Merge cbt/master

Conflicts:
	application/views/stadium_view.php
	asset/css/style.css