Fixed sorting for items and users
Merge branch 'master' into feature/34/sorting

Conflicts:
	Gemfile.lock
Merge pull request #34 from ZeusWPI/feature/34/sorting

Sort items, partners, reservations by name