Improve the category function,merge the indexcontroller to topiccontroller
Merge branch 'master' of https://github.com/cleochan/ticket

Conflicts:
	application/modules/wiki/views/scripts/shared/wiki_template.phtml