역사보기 기능 추가중
conflict 해소
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/modules/hiswiki/hiswiki.model.php
	hguhis/modules/hiswiki/skins/default/topic_view.html
지희:히스토리 완성
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/modules/hiswiki/skins/default/topic_view.html