This commit has changes to the abilities.rb for user roles. Also there are changes
to the model class names so that they match the name of the model.rb file