Merge pull request #17 from badnack/development

Development
Merge pull request #18 from badnack/development

Development
Added search bar, moved some thing out of permanent header
Merge remote-tracking branch 'upstream/development' into development

did som things
do not show old suppr
added optimistic locks
Merge pull request #20 from badnack/development

Development
added destroy dependency
Merge pull request #21 from badnack/development

added destroy dependency
added task to remove old supprs
added infinite scrolling and improved seed
Merge pull request #22 from badnack/development

Development
Design stuff, and implementation of photo-uploader from computer
updating number of seats available
changed name tag
fixed tests
Merge pull request #23 from badnack/development

Development
Merge remote-tracking branch 'upstream/development' into development

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