include up-votes and inappropriate-flags in resource display
Merge branch 'master' of github.com:trawick/edurepo