complete edit information
Merge branch 'OpenCart' of https://github.com/quangthi90/Training072014 into OpenCart