Added Role Mapper and Collection with tests.
Optimized tests on UserMapper and RoleMapper tests.
Merge remote-tracking branch 'origin/master'