Merge branch 'entries-handling'

Conflicts:
app/models/form_entry.rb
app/views/form_entries/_form.html.erb