ok
'
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/WatchList/WatchList.iml

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