修正
 - 修正前台tag也中图片显示类型问题




Signed-off-by: leiddx <leiddx@vip.qq.com>
修正
 - 新增图片
 - 引入south
 - 新增tasting



Signed-off-by: leiddx <leiddx@vip.qq.com>
修正
 - 修正前端幻灯片插件.



Signed-off-by: leiddx <leiddx@vip.qq.com>
修正商场幻灯片插件IE6下显示BUG


Signed-off-by: leiddx <leiddx@vip.qq.com>
Merge branch 'master' into inventory

Conflicts:
	account/templates/login.htm
	account/templates/vieword.htm
	inventory/admin.py
	inventory/models.py
	inventory/templates/inventorylist.htm
	inventory/templates/inventoryui.htm
	new31/settings.py
	new31/static/images/nn.jpg
	shop/static/shop/css/css.less
	shop/templates/shop.base.htm
	tasting/models.py
	tasting/templates/tasting.htm
Merge branch 'master' of https://github.com/leiddx/new31.git into inventory
修正
 - 兼容IE6+



Signed-off-by: leiddx <leiddx@vip.qq.com>