Add description to item
Fixed sorting for items and users
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
Put sqlite back
Revert "Put sqlite back"

This reverts commit f6fc53149cb83ffb4a014c23b4ecc71663c2da7f.
Merge pull request #34 from ZeusWPI/feature/34/sorting

Sort items, partners, reservations by name
Merge branch 'master' into feature/29/general-reports

Conflicts:
	Gemfile.lock