学生一覧の種別の選択項目に修了生を追加する。
Merge remote-tracking branch 'origin/master' into chou
Merge remote-tracking branch 'origin/master' into chou

Conflicts:
	app/models/aiit_member.rb
	log/test.log
Merge remote-tracking branch 'origin/master' into chou

Conflicts:
	log/test.log
Merge branch 'validation1' of https://github.com/robinhood205/Aiit-Student-Manager into validation1

Conflicts:
	db/test.sqlite3
	log/test.log
Merge branch 'validation1' of https://github.com/robinhood205/Aiit-Student-Manager into validation1
身分異動の項目を編集した。
Merge remote-tracking branch 'origin/validation1'