change column names for types and subjects, repair sorting issues
merge master to branch
edit can can permissions, more sorting stuff
Merge pull request #16 from thomashopkins/fixify

Fixify