Revert "update combo"

This reverts commit 861631b88c2f45f376012aaa6d6adf36bf0e59ae.
Commit

Commit
Merge branch 'master' of https://github.com/mono13th/tourism

Conflicts:
	application/views/news.php