my commit testing

Test
Merge remote-tracking branch 'origin/master'

Conflicts:

	data/Smarty/templates_c/default_en-US/%%AD^AD3^AD35CD1B%%confirm.tpl.php