uploader edits, node form edits
Merge branch 'development'