merged from development and other revisions
Merge remote-tracking branch 'origin/noel' into development

Conflicts:
	application/models/manage_model.php