Design stuff, and implementation of photo-uploader from computer
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	app/views/dinners/index.html.erb
	db/schema.rb
Removed photo