Resultaten Merge

Conflicts:
	Snackator/app/src/main/java/snackator/nmct/howest/be/snackator/activity/BaseActivity.java
	Snackator/app/src/main/java/snackator/nmct/howest/be/snackator/activity/MainActivity.java
	Snackator/app/src/main/java/snackator/nmct/howest/be/snackator/adapter/AddsRecyclerViewAdapter.java
	Snackator/app/src/main/java/snackator/nmct/howest/be/snackator/fragment/AddsFragment.java
	Snackator/app/src/main/java/snackator/nmct/howest/be/snackator/listener/SnackatorAddCardViewClickListener.java
	Snackator/app/src/main/java/snackator/nmct/howest/be/snackator/task/ImageFromUrlTask.java
	Snackator/app/src/main/res/drawable/Thumbs.db
	Snackator/app/src/main/res/layout/add_list_item.xml
	Snackator/app/src/main/res/values/colors.xml