finish
Merge branch 'getFriends'

Conflicts:
	common/models/user.js
	test/user.spec.coffee