Merge origin/master

Conflicts:
	templates/default/modules/javascript/account-main.tpl