Merge remote-tracking branch 'origin/master' into revise_student_views

Conflicts:
	frontend/app/views/gaku/shared/fields/_person_show_table.html.slim
Merge remote-tracking branch 'origin/revise_student_views' into revise_student_views
fixed for student edit view