fix typos from latest merge. finish sprintf-ying printModifyForm.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	html/libs/primary.php