Merge pull request #259 from forumbyr/master

update build file; fix variants query problem
Merge pull request #261 from forumbyr/master

update build file
Merge pull request #7 from cnnic/dev

Dev
Merge pull request #263 from forumbyr/master

update build file
checkstyle
Merge commit 'cc8f125c5b20d56b2a996992edb4661dc83c6fb5' into dev

Conflicts:
	rdap-webapp/src/main/java/cn/cnnic/rdap/dao/NoticeDao.java
Merge branch 'dev' of https://github.com/wade1012/rdap.git into dev
Merge commit 'a6efe6cd74aa4c6f0f54a1d7465319c9c8655854' into dev
arrange checkstyle for dao
fix domain util
Merge pull request #271 from wade1012/dev

Dev Wade
checkstyle for package-info.java
Merge pull request #272 from wade1012/dev

checkstyle for package-info.java
add packageinfo for package
modify comments
Merge pull request #273 from wade1012/dev

Dev Wade
Merge pull request #274 from forumbyr/master

update sql.
checkstyle for bean
Merge pull request #277 from wade1012/dev

checkstyle for bean
checkstyle for common