Merge remote-tracking branch 'origin/master'

Conflicts:
	assert-web/src/main/java/com/xbrother/cmdb/rs/IncrementalUpdateRs.java
	assert-web/src/main/webapp/WEB-INF/web.xml
	cmdb-web/src/main/webapp/WEB-INF/web.xml
	cmdb-web/src/test/java/com/xbrother/cmdb/rs/ConfigurationItemRsTest.java
Merge remote-tracking branch 'origin/master'