Moet commit van github
Merge branch 'Hoye' of https://github.com/Zenj1n/Watch-List into Hoye

Conflicts:

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

	MyApplication/WatchList/src/main/java/com/zenjin/watchlist/watchlist/Hm_MainActivity.java
	MyApplication/WatchList/src/main/res/layout/fragment_discover.xml
	MyApplication/WatchList/src/main/res/layout/hm_activity.xml