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

Conflicts:
	js/index_water.js
	js/product.js
	js/promo.js
Merge branch '20131011' of https://github.com/victorgong/intimeprototype into 20131011