Fixed routing and assignment_form issues
Merge remote-tracking branch 'origin/rails4' into rails4