UserProfile service integration.
Merge remote branch 'origin/master'

Conflicts:
	js/services.js
UserProfile service integration.