Merge origin/master

Conflicts:
	web/cp_customer_my_watchlist_home.jsp
Merge origin/master
Merge origin/master