update
Merge branch 'OpenCart' of https://github.com/quangthi90/Training072014 into OpenCart
update
Merge branch 'OpenCart' of https://github.com/quangthi90/Training072014 into OpenCart

Conflicts:
	Topic6/application/models/ListPost.php

Signed-off-by: nguyennga10 <nguyennga.khtn10@gmail.com>