fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/hackzurich/wishlist/MainActivity3.java
	app/src/main/java/com/hackzurich/wishlist/MyWishesFragment.java