sync item&catalogue&image
Merge branch 'master' of https://github.com/xiezuming/nirvanaWeb.git

Conflicts:
	application/controllers/catalogue.php
	application/controllers/item.php
	application/models/catalogue_model.php