Fix issue 1196: MultipartFormData body parser confused by semicolon in Content-Disposition header

Fix for https://github.com/playframework/Play20/issues/1196
Issue 1196: Added spec/test
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
Issue 1196: Fix test/spec
Merge branch 'master' of https://github.com/marcuslinke/Play20
Source formatted via './build scalariform-format'
Merge pull request #1199 from marcuslinke/master

Fix issue 1196: MultipartFormData body parser confused by semicolon in Content-Disposition header