Merge pull request #14 from nistormihai/devel

LB-510: Livedesk admin isn't working!
LB-495 : Manage Collaborators is broken
Merge pull request #15 from gizm0bill/sprint-lb-1.3-users

LB-495 : Manage Collaborators is broken