Merge branch 'master' into 2014-02-10-profile
Merge branch 'master' into 2014-02-10-profile
Merge branch 'master' into 2014-02-10-profile
2014-02-11 profile_edit,add deal
product image
Merge remote-tracking branch 'origin/2014-02-10-profile'
Update ApiProduct->createProduct()