File/image upload refactored
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/pages/field_form.php