user and role entities updated 11/05/2013