2014-11-23 for update
2014-11-23 for merge
2014-12-3
update what?
Merge branch 'dev' of github.com:xhy940801/Discovery-view into dev
add some test,and change the FileController