완성도 업!중임...
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/files/cache/module_info/hiswiki.ko.1.5.4.1.php
	hguhis/files/cache/queries/addon.getSiteAddons.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/addon.insertSiteAddon.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/admin.getFavorite.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/admin.insertFavorite.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/autoinstall.getInstalledPackages.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/autoinstall.getLatestPackage.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/autoinstall.getPackageSrlByPath.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/comment.getCommentCount.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/comment.getNewestCommentList.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/counter.getCounterLog.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/counter.getTodayStatus.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/counter.updateCounterPageview.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.deleteAlias.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.deleteDocument.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.deleteDocumentExtraVars.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.deleteHistory.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.getCategoryDocumentCount.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.getDocument.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.getDocumentCountByDate.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.getDocumentDivision.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.getDocumentExtraKeys.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.getDocumentExtraVars.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.getDocumentList.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.getDocumentListWithinTag.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.getDocuments.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.insertCategory.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.insertDocumentExtraKey.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.insertDocumentExtraVar.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.updateCategoryCount.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/document.updateDocument.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/editor.deleteSavedDoc.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/editor.getComponent.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/editor.getComponentList.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/editor.getSavedDocument.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/editor.isComponentInserted.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/file.getFilesCount.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/file.updateFileValid.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/hiswiki.getDocumentSrlByTag.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/hiswiki.getHiswikiDoc.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/hiswiki.getPopularDocuments.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/hiswiki.insertHiswikiDoc.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/hiswiki.insertHiswikiTrace.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/hiswiki.updateHiswikiDoc.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/layout.getLayout.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/layout.getLayoutDotList.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/layout.insertLayout.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/layout.updateLayout.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/member.getGroups.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/member.getMemberCountByDate.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/member.getMemberGroups.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/member.getMemberInfoByMemberSrl.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/member.getMemberList.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/member.insertDeniedID.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/menu.getMenu.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/menu.getMenuByTitle.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/menu.getMenuItems.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/menu.insertMenu.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/menu.insertMenuItem.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.deleteModuleExtraVars.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.getActionForward.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.getModuleConfig.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.getModuleExtend.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.getModulePartConfig.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.getModuleSkinDotList.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.getModuleSkinVars.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.getSite.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.getTrigger.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.getTriggers.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.insertActionForward.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.insertModule.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.insertModuleExtraVars.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.insertTrigger.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.isExistsModuleName.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.isExistsSiteDomain.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/module.updateModule.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/point.getPoint.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/point.updatePoint.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/syndication.getExceptModule.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/syndication.getGrantedModule.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/syndication.insertLog.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/tag.deleteTag.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/tag.getDocumentSrlByTag.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/tag.getTagList.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/tag.insertTag.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/trackback.getNewestTrackbackList.1.5.4.1.mysql.cache.php
	hguhis/files/cache/queries/trackback.getTrackbackCount.1.5.4.1.mysql.cache.php
	hguhis/files/cache/template_compiled/06b24e4213b19974b17757a6acf05d77.compiled.php
	hguhis/files/cache/template_compiled/0f77220c26b9bd1a09bffd2ff40e118c.compiled.php
	hguhis/files/cache/template_compiled/51845285f720556c198ce54658372a85.compiled.php
	hguhis/files/cache/template_compiled/b4341ec7b334a8d30a66414a15b890ee.compiled.php
	hguhis/files/cache/template_compiled/cbfc1151c8f3e1b3f6b38a0828651f4a.compiled.php
	hguhis/files/cache/template_compiled/d1cdafe3cc2f8b04262e9d7c9db69aa7.compiled.php
	hguhis/files/cache/template_compiled/df0678597fd6afa462d76592db481b0d.compiled.php
	hguhis/files/config/db.config.php
	hguhis/files/env/easyinstall_last
	hguhis/files/member_extra_info/point/004/4.cache.txt
	hguhis/modules/hiswiki/conf/module.xml
	hguhis/modules/hiswiki/hiswiki.view.php
	hguhis/modules/hiswiki/skins/default/search_box.html
	hguhis/modules/hiswiki/skins/default/search_result.html
	hguhis/modules/hiswiki/skins/default/write.html