images
resize
fixed edit image
resize e upload image to fit box in editview
fix again
Merge remote-tracking branch 'origin/master' into authentication

Conflicts:
	assignment1/public/css/custom-browseView.css
	assignment1/public/css/custom.css
	assignment1/public/js/views/dishview.js
	assignment1/public/tpl/EditView.html