Merge pull request #9 from cnnic/master

fetch from cnnic
Merge pull request #10 from cnnic/master

fetch from cnnic
oauth modify
Merge branch 'me1216' into 1216cnnic
merge controller
Merge pull request #124 from forumbyr/master

add dao query package
Merge pull request #125 from forumbyr/master

update spring conf
Merge pull request #126 from forumbyr/master

move classes to its package
Merge pull request #2 from cnnic/master

m
Merge pull request #11 from cnnic/master

fetch from cnnic
fix xml bug
Merge branch 'Mmaster'
oauth query result modify
Merge pull request #127 from yun51/master

fix xml bug
Merge pull request #128 from larrychen8276/master

query result modify
Merge pull request #129 from larrychen8276/1216cnnic

1217 query result modify
Merge pull request #12 from cnnic/master

merge from cnnic