Merge branch 'master' of https://github.com/glock45/swifter

Conflicts:
	Common/HttpParser.swift
	Common/HttpServer.swift