Merge origin/master

Conflicts:
	application/controllers/stadium.php
	application/views/home_view_1.php
	application/views/result_search.php
	asset/css/style.css