User roles
Can ask if a user has multiple roles
Check required_roles against user in Ability#can?
Only show subforums that the user's roles permit
WIP: fix tests
Fix user role tests
Require roles to see threads
Pull subforum required roles query into method
Use a scope instead of a method
Fix post test
Set roles when creating/updating users
Make user admin if they are HS faculty
Give faculty all roles
Fix user roles migration
Multiline block goes in do/end
has_roles? => satisfies_roles?
Merge branch 'user-roles'

Conflicts:
	app/assets/javascripts/client-prod.js
Top/bottom margin on lists in post bodies
Merge branch 'master' into post-numbers

Conflicts:
	app/assets/javascripts/client-prod.js
	db/structure.sql
Update client tests