Add description to item
Fix logout button
Merge pull request #33 from ZeusWPI/feature/33/add-description-to-item-dropdown

Add description to dropdown for partners to reserve items
Merge branch 'master' into fix/32/logout-button-redirect

Conflicts:
	Gemfile.lock
Merge pull request #32 from ZeusWPI/fix/32/logout-button-redirect

Fix logout button
Merge branch 'master' into feature/34/sorting

Conflicts:
	Gemfile.lock