Merge branch 'cnnic-dev'
entity query - model & jcard util.
Merge remote-tracking branch 'cnnic/dev'
Merge remote-tracking branch 'origin/master'
entity query.
Merge remote-tracking branch 'cnnic/dev'
Merge pull request #152 from forumbyr/master

entity query - dao