Issue 1196: Fixed problem with escaped quotes in filename
Merge branch 'master' of https://github.com/marcuslinke/Play20.git

Conflicts:
	framework/src/play/src/test/scala/play/api/mvc/ContentTypesSpec.scala