Merge origin/master

Conflicts:
	application/models/news_model.php