Merge branch 'master' into admin
Add more resource counts to the index page. Add short name field to 'house' model.
Render some of the raw HTML field content in the 'meeting report' list view.
Merge branch 'tmp'
Remove 'committe_info' admin views. Remove some fields from Meeting Report views.