test
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/Smarty/templates/default_en-US/frontparts/form_personal_input.tpl