Fix for Issue #5: DiscardedClientRequest is not generated

Conflicts:
	project/Common.scala
	spray-funnel/src/main/resources/pom_2.10.xml
	spray-funnel/src/main/resources/pom_2.9.2.xml
Increased version number and removed reference to scala 2.11 in 2.10 only branch