Category JS finished

Should be..
Merge branch 'master' of https://github.com/cleochan/ticket

Conflicts:
	application/modules/wiki/controllers/TopicController.php