장호 - accepted.
장호 - accept
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/modules/hguhis/hguhis.admin.view.php
hguhis.admin.view accepted.