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

Conflicts:
	hguhis/modules/addon/addon.admin.controller.php
Merge remote-tracking branch 'origin/hguhis' into hguhis