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

Conflicts:
	Topic 6/database.txt