不要ファイルの削除
リスト表示修正
Merge branch 'master' into delete_no_use_sources
Signed-off-by: unknown <yamamoto@yamamoto-7-1311.inis.co.jp>
Signed-off-by: unknown <yamamoto@yamamoto-7-1311.inis.co.jp>
Merge branch 'master' into delete_no_use_sources
Signed-off-by: unknown <yamamoto@yamamoto-7-1311.inis.co.jp>
Signed-off-by: unknown <yamamoto@yamamoto-7-1311.inis.co.jp>
Merge branch 'master' into delete_no_use_sources

Conflicts:
	app/views/shared/_listalartgrp.html.erb

Signed-off-by: unknown <yamamoto@yamamoto-7-1311.inis.co.jp>
Signed-off-by: unknown <yamamoto@yamamoto-7-1311.inis.co.jp>
Merge branch 'master' into delete_no_use_sources