wip
removing dependency with users
Merge branch 'develop' of https://github.com/riccardone/CatchMeUi.git into develop

Conflicts:
	CatchMeUi/scripts/app/friends.js
Changes made by Riccardo Di Nuzzo (riccardo@dinuzzo.it).