Merge branch 'master' of https://github.com/meeboxchina/devops

Conflicts:
	pom.xml
	src/main/java/devops/dns/package-info.java
	src/main/java/devops/package-info.java
	src/main/webapp/WEB-INF/web.xml
Merge branch 'master' of https://github.com/meeboxchina/devops