Changed the view to use new assignment_form
Merge remote-tracking branch 'origin/rails4' into rails4