module.xml 오류 수정
검색 결과 모듈 수정 추가
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/modules/hiswiki/conf/module.xml
	hguhis/modules/hiswiki/hiswiki.view.php
Merge remote-tracking branch 'origin/hguhis' into hguhis