Generating conflict
Merge remote-tracking branch 'origin/master'

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