update interface login
Merge branch 'master' of https://github.com/quanvh90/opencart

Conflicts:
	upload/catalog/view/theme/default/template/account/edit.tpl