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

Conflicts:
	hguhis/modules/hiswiki/hiswiki.view.php
게시판 연동 기능 추가 + FrontPage 에서 필요 데이터 불러옴.
Merge remote-tracking branch 'origin/hguhis' into hguhis