Merge branch 'master' of https://github.com/jamming/spark

Conflicts:
	pom.xml
	src/main/java/spark/Request.java
	src/main/java/spark/Response.java
	src/main/java/spark/route/SimpleRouteMatcher.java
	src/main/java/spark/utils/MimeParse.java
	src/main/java/spark/webserver/SparkServerFactory.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/spark/route/SimpleRouteMatcher.java