fixed some bugs
Merge branch 'master' of https://github.com/cleochan/ticket

Conflicts:
	application/modules/wiki/controllers/TopicController.php
	application/modules/wiki/views/scripts/shared/wiki_topic_table.phtml
Merge branch 'master' of https://github.com/cleochan/ticket

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