Change again
Merge branch 'master' of
https://github.com/MattiasMagnetic/StockWatcher.git

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