bug
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/modules/document/document.model.php