no message
Merge pull request #129 in YIN/basic from feature/YIN-294 to master

# By Chaozhang Xue (14) and others
# Via Chaozhang Xue (22) and others
* commit '4a7d23ab65a2c8e54e350154d50e2e992368d827': (60 commits)
  no message
  News page.
  Unfinished
  eavAttr
  个人信息、收货地址、修改密码、我的订单、我的收藏夹处的界面微调
  update deliver button
  no message
  Repair orders front function.
  Background order problem.
  database
  the database rc11 upload wrong versions
  fixed delete item or deliver can't return backurl
  fixed update item image can't work
  single page management
  no message
  修改了后台搜索框功能失效的bug，是多次加载jquery的原因，对线上的数据库进行了修改，eavAttr改成了大写。但是需要所有机子的mysql都配置lower_case_table_names=0
  no message
  update default logo
  no message
  add replace logo function
  ...
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic

Conflicts:
	protected/widgets/default/views/topNav.php
	themes/leather/views/item/view.php
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into hotfix/YCB-67cart
还原了清空购物车按钮
Merge pull request #146 in YIN/basic from hotfix/YCB-67cart to develop

# By Jiadong.Han (1) and changhai.lin (1)
# Via Jiadong.Han (3) and Chaozhang Xue (1)
* commit 'ce67977f373d9f30afff59f649f6f317e71d36ba':
  还原了清空购物车按钮
  no message