Merge branch '0.3-beta' …

Conflicts:
	project.clj
	ring-core/project.clj
	ring-devel/project.clj
	ring-httpcore-adapter/project.clj
	ring-jetty-adapter/project.clj
	ring-servlet/project.clj