modify model and model's test cases
follow-up to changes in data structures
update todo comments
Merge pull request #224 from ICTKyouikukei2013/kamiya/db

データ構造の変更