initial addition of Pundit authorization
add user roles
implement role functionality - incomplete
merge remote develop into authorization
Merge branch 'develop' into authorization
change user to have only one role
display users & roles
project policy
pundit & roles
merge authentication with branch develop
enumarated roles
user roles in active admin
store roles using roles_mask
add redirect for users without roles
Add show instructions field to instruments model
Update model annotations
Fix merge conflict
Merge branch 'develop' of https://github.com/mnipper/rails_survey into develop
add instrument policies
Add instruction toggle to instrument