query
Merge remote-tracking branch 'origin/Jason-v00' into Jason-v00

Conflicts:
	MyApplication/WatchList/src/main/java/com/zenjin/watchlist/watchlist/InfoPage.java
/