added set topic in category
Merge branch 'develop' of github.com:knutesten/kad into develop

Conflicts:
	src/main/java/no/mesan/persistence/topic/TopicDaoImpl.java