update
add frienshiprequest mock function
Merge branch 'origin/feature-addressbook-concept'

Conflicts:
	app/tpl/directives/cm-search-cameo-id.html