添加商品类别管理，商品管理待完善，修改店铺公告图片显示问题
Merge branch 'develop' of github.com:WangTe/WuJiaDian into develop

Conflicts:
	application/views/notice.php