Add Service Users/Friends
Merge branch 'master' of https://github.com/sebgeelen/vikingBros

Conflicts:
	backend/server.js