null
Merge branch 'dev' of github.com:xhy940801/Discovery-view into dev
2014-12-12 update
Merge branch 'dev' of github.com:xhy940801/Discovery-view into dev