通常/訓練/試験モード対応
Merge branch 'master' of ssh://github.com/LGDIS/LGDPM

Conflicts:
	app/controllers/evacuees_controller.rb
	config/settings.yml.example