+ document retrive
+ model
+ abstract
improve query with concept
Merge branch 'xiaohan'
resolve conflict