friends list bugfix
Merge branch 'develop' of https://github.com/cuappdev/eatery

Conflicts:
	Eatery/Eatery/User.swift