Merge pull request #18 from cnnic/master

fetch from cnnic
replace map key
Merge pull request #156 from forumbyr/master

merge from cnnic
Merge pull request #157 from forumbyr/master

fix bug
Merge pull request #19 from cnnic/master

fetch from cnnic
text view
Merge branch 'Mmaster'
Merge pull request #160 from yun51/master

text view
remove struts2
modify AbstractDbQueryDao.java jdbc to JdbcTemplate
Merge pull request #161 from larrychen8276/master

remove struts2
Merge pull request #17 from cnnic/master

merge from cnnic