Merge pull request #14 from cnnic/master

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

fetch from cnnic
Merge pull request #139 from larrychen8276/master

oauth role add
Merge pull request #14 from cnnic/master

merge from cnnic
fix bug ns query
Merge pull request #140 from forumbyr/master

fix bug ns query
xml view modify
spring-common
Merge pull request #17 from cnnic/master

fetch from cnnic
spring-common
Merge branch 'new' into head
Merge pull request #152 from yun51/master

modify spring-common
Merge pull request #15 from cnnic/master

merge from cnnic
as query input
Merge pull request #153 from forumbyr/master

	as query input
Merge pull request #8 from cnnic/master

m