Changed order columns: gift flags (gift_flag && gift_price)
add email in cart_info
modified db in home
Merge branch 'master' of github.com:wangguoqin1001/Scorpio
Updated return values in orders controller
Use email info from input when necessary
Fixed mistype
Corrected multiple javascripts
add table about fare
Merge branch 'master' of github.com:wangguoqin1001/Scorpio
Fixed bugs in cart
Merge branch '4.0-stable'
Fixed bug in cart thumb
Renew product id
Fixed multiple bugs in cart thumb
Renew company name
Modified strategy in updating models
Modified product SKU
add edit inline
del ..