加入swfuploader上传
Merge branch 'master' of git://github.com/yinhe/yincart
Merge branch 'master' of git://github.com/yinhe/yincart
Merge branch 'master' of git://github.com/yinhe/yincart
清除assets目录
Converted CRLF to LF
错误代码bug
Merge pull request #8 from davidhhuan/master

整理代码