Fixed issue: PHPDoc fixes
Fixed issue #692: roles and users IDs merged in one class
Merge pull request #694 from sergeyklay/feature-bootstrap-3

User/Roles fixes