[#56000282] [#56000326] Initial work to update users, including add/remove feeds
Merge branch 'master' of github.com:ZooKeepers/giraffe

Conflicts:
	server/server.js