Merge remote-tracking branch 'origin/conflict2'

Conflicts:
	src/com/google/gwt/sample/stockwatcher/client/StockPrice.java