ab
delete unreach *.xml
delete unreach *.xml
delete unreach *.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/renren/ntc/sg/dao/SWPOrderDAO.java
	wdspider/pom.xml
	wdspider/src/main/java/HttpClient.java
	wdspider/src/main/java/dao/WPOrderDAO.java
	wdspider/src/main/java/test.java
	wdspider/target/classes/HttpClient.class
	wdspider/target/classes/HttpClient.java
	wdspider/target/classes/dao/WPOrderDAO.class
	wdspider/target/classes/test.class
	wdspider/target/classes/test.java