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

Conflicts:
	Topic6/application/views/welcome_message.php
Merge branch 'OpenCart' of https://github.com/quangthi90/Training072014 into OpenCart
Merge branch 'OpenCart' of https://github.com/quangthi90/Training072014 into OpenCart
Merge branch 'OpenCart' of https://github.com/quangthi90/Training072014 into OpenCart
Merge branch 'OpenCart' of https://github.com/quangthi90/Training072014 into OpenCart