Bug fix in content model
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/models/content_model.php