merging...
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/modules/hiswiki/conf/module.xml
	hguhis/modules/hiswiki/hiswiki.view.php
merge
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/modules/hiswiki/conf/module.xml
	hguhis/modules/hiswiki/hiswiki.admin.view.php
	hguhis/modules/hiswiki/hiswiki.model.php
	hguhis/modules/hiswiki/hiswiki.view.php
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/modules/hiswiki/conf/module.xml
	hguhis/modules/hiswiki/hiswiki.admin.view.php