Experimental version
Merge branch 'master' of https://github.com/Utapia/services

Conflicts:
	src/resources/friendships/model.js