Merge branch 'testing'

Conflicts:

StockWatcher/src/com/google/gwt/sample/stockwatcher/client/StockWatcher.
java