added edit ,delete and history function
Merge branch 'master' of https://github.com/cleochan/ticket

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