完善2014-8-3
111
111
11
Merge branch 'master' of https://github.com/luhangyu/rosten-asset.git