작업중...
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/modules/hiswiki/hiswiki.admin.controller.php
머지작업
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/modules/document/document.model.php
	hguhis/modules/hiswiki/hiswiki.view.php
	hguhis/modules/hiswiki/skins/default/category_list.html
	hguhis/modules/hiswiki/skins/default/front_page.html
	hguhis/modules/hiswiki/skins/default/modify_front_page.html
	hguhis/modules/hiswiki/skins/default/search_box.html
extra_vars로 데이터 이동 (start_date,end_date)