Alert for watch and add to cart!
Merge remote-tracking branch 'origin/master'

Conflicts:
	UID-new/item2.php