merging...
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/modules/hiswiki/hiswiki.admin.controller.php
front_page.html에 모듈 설정 버튼 추가
merging...
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/modules/hiswiki/hiswiki.view.php
Merge remote-tracking branch 'origin/hguhis' into hguhis
category 완성중...