update product.js promo.js special.js zxcx.js
Merge branch '20131011' of https://github.com/victorgong/intimeprototype into 20131011

Conflicts:
	js/zxcx.js