fiddling with user Roles

Playing with roles to verify the user hasn't maliciously changed a role
to admin. This is not yet complete!
Merge branch 'master' of https://github.com/gsargent/ikonshow_app

Conflicts:
	saved my comment and accepted Dave's additions
Added to comment about xray gem