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

fix compile problem.
Merge remote-tracking branch 'origin/master'
Merge pull request #21 from cnnic/dev

Dev
checkstyle
Merge remote-tracking branch 'remoteGit/dev' into dev
Merge pull request #150 from wade1012/dev

Dev Wade
entity query.
Merge remote-tracking branch 'cnnic/dev'