t
delete confirmations table
qwe
Merge branch 'master' of https://github.com/iboss-ptk/cba_line5_site
still get 500 internal server error when buying
try catch detect updated_at not found
user edit successful!!!!!
confirm address in DoOrderController
Merge branch 'master' of https://github.com/iboss-ptk/cba_line5_site

Conflicts:
	app/controllers/DoOrderController.php
eiei
Merge branch 'master' of https://github.com/iboss-ptk/cba_line5_site

Conflicts:
	app/controllers/ShopController.php
....
Merge branch 'master' of https://github.com/iboss-ptk/cba_line5_site