Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/.idea/gradle.xml
	MyApplication/WatchList/WatchList.iml
	MyApplication/WatchList/build.gradle