Merge branch 'master' of C:\Users\Jonas\Documents\AndroidStudioProjects\dinnerplanner-android with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/se/kth/csc/iprog/dinnerplanner/android/MenuActivity.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/se/kth/csc/iprog/dinnerplanner/android/MenuActivity.java
Renaming of method set_details_ingredients and added detailsview in manifest