messed up XML
more messing up
Merge branch 'new'

Conflicts:
	src/com/google/gwt/sample/stockwatcher/StockWatcher.gwt.xml