Fix #6 - add ids to category and feature so they can be linked.
IDE updates only
Merge remote-tracking branch 'origin/master'

Conflicts:
	django_project/changes/templates/version/detail-content.html