ok
Merge branch 'Fabian-v3' of https://github.com/Zenj1n/Watch-List into Fabian-v3

Conflicts:
	MyApplication/.idea/gradle.xml
	MyApplication/MyApplication.iml
Merge branch 'Fabian-v3' of https://github.com/Zenj1n/Watch-List into Fabian-v3