Merge remote-tracking branch 'hoatle/tasks/31_django-boilerplate_v0.1.0_release'
update categories (this will break some existing categories, expected!), update to latest content information