Merge origin/master

Conflicts:
	application/views/stadium_view.php