take 2

changed random stuff
Merge branch 'justin's-stuff'

Conflicts:

StockWatcher/src/com/google/gwt/sample/stockwatcher/client/LoginInfo.jav
a