test brand 1
test push branches
sửa lại upload ảnh phần update product
Thêm link quản lý config ở phần mnenu trong trang admin
ok gitignore
Merge branch 'master' of https://github.com/luoi/phpmock.git
Merge branch 'master' of github.com:luoi/phpmock
modifile ignore file
Merge branch 'master' of https://github.com/luoi/phpmock.git
Merge branch 'master' of https://github.com/luoi/phpmock.git

Conflicts:
	application/modules/administrator/controllers/product.php