Add localfile react field
Merge remote-tracking branch 'upstream/react' into react-localfile

Conflicts:
	admin/src/fields.js
Merge pull request #794 from sebmck/react-localfile

Add localfile react field