Merge branch 'codeEdit1'

Conflicts:
	StockWatcher/src/com/google/gwt/sample/stockwatcher/server/Stock.java