Merge pull request #3 from cnnic/master

m
Merge pull request #130 from forumbyr/master

refactor
Merge pull request #131 from forumbyr/master

fix bug-wrong commit
Merge pull request #12 from cnnic/master

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

m
oauth add confirm authentication
Merge branch '1216cnnic'
Merge pull request #133 from larrychen8276/master

add confirm authentication
fix xml bug
add dot/index.jsp
Merge pull request #13 from cnnic/master

fetch from cnnic
Merge branch 'Mmaster'
Merge pull request #134 from yun51/master

fix xml bug, add dot/index.jsp
Merge pull request #13 from cnnic/master

merge from cnnic