Revert "Temporarily removed file fields"

This reverts commit 732a768601a192291f076f94428142a6b36c58fb.
Merge branch 'master' into add_file_fields
Merge branch 'master' into add_file_fields
Merge branch 'master' into add_file_fields
Got paperclip gem working