Fixed permissions. Replaced is_role with just superadmin?.
Merge branch 'refresh' of github.com:jSherz/luskydive into refresh

Conflicts:
	app/models/ability.rb
	app/models/admin.rb