added cancel button to popup
Merge branch 'interaction' of https://github.com/Fonserbc/dinnerplanner-android into interaction

Conflicts:
	src/se/kth/csc/iprog/dinnerplanner/android/view/ChooseView.java

src/se/kth/csc/iprog/dinnerplanner/android/view/ChooseViewController.jav
a