Changes to be committed:
	modified:   build.gradle
Merge branch 'master' of https://github.com/pcbill/wula

Conflicts:
	build.gradle

pull from origin

 Changes to be committed:
	modified:   build.gradle
	modified:   src/main/java/wula/HttpServer.java
	modified:   src/main/java/wula/Main.java
	new file:   src/test/java/wula/HttpServerTest.java
	deleted:    web/webapps/context/WEB-INF/applicationContext.xml
	modified:   web/webapps/context/WEB-INF/spring-servlet.xml
	modified:   web/webapps/context/WEB-INF/web.xml