End authorization FB...
change user-service
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/app/controllers/admin-user.js