Merge remote-tracking branch 'origin/master' into Rinesh

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