ADDED CONFLICT
Merge https://github.com/vbarua/GitLabQ into Victor

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