Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/news_controller.php