Chiva Register and update user info
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/Smarty/templates_c/default_en-US/%%25^25F^25F4D99F%%kiyaku.tpl.php