Changes in the questionnaire display of courses
Merge remote-tracking branch 'origin/rails4' into rails4