B7(m)

v-2.1a-p1-t3-version2
---
1. Minor change
B7(m)

v-2.1a-p2-t1
---
1. Forgot to merge master to this. Merging...
Merge branch 'master' into B7_create_word_list

Conflicts:
	app/controllers/admin_controller.rb
	doc/abc/log.txt
B7

v-2.1a-p2
---
1. Problem in generating a word list
2. Halt => Add a new column "Title"(B8_add_column_Text_Title)
Merge github.com:iwabuchiken/CR5-R-

Conflicts:
	app/controllers/admin_controller.rb
	doc/abc/log.txt