Pictures can now be resized
Merge remote-tracking branch 'origin/master'

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