shopend views changed
shopend views changed
Merge branch 'master' of https://github.com/yinhe/yincart

Conflicts:
	.idea/vcs.xml
cancel i18n db
add dump function
add post model
some shopend change
move data
update backend
update backend
yiibootstrap->2.0, property and upload image in backend
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
Merge pull request #21 from gaolujie1989/master

yiibootstrap->2.0, property and upload image in backend
Merge pull request #1 from yinhe/master

更新到最新版本Yincart20131227