- update

Signed-off-by: tuyetphale993 <tuyetphale993@gmail.com>
Merge branch 'OpenCart' of github.com:quangthi90/Training072014 into OpenCart

Conflicts:
	Topic6/application/views/template/account/signin_view.php