new template
Merge branch 'user' of github.com:herophuong/oldstuff into user

Conflicts:
	module/User/view/user/user/edit.phtml
	module/User/view/user/user/login.phtml
	module/User/view/user/user/register.phtml