Merged Gemfiles. Added user_role model. Updated DB.