fix the error of wrong method name
Merge branch 'master' of https://github.com/xiezuming/nirvanaWeb.git

Conflicts:
	application/controllers/catalogue.php