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
Add cookie methods to WS Response, add a WS Cookie wrapper around the async http cookie.
Fix race condition in WS.client and WS.resetClient
Fix package script for 2.2 milestone release
Specify Form.Field as the return type
Update "Building From Source" to 2.2-SNAPSHOT

Remove the references to old SBT version.
Remove the reference to Play20.wiki.git (documentation is inline).
Change references to "Play 2.0" to be just "Play".
Fix the SBT plugin to say 2.2-SNAPSHOT
Remove link to invalid stack overflow question.
Remove reference to "Play Beta and edge"
Use "active voice" to keep headers consistent.
Remove period at the end of header.
Merge pull request #1312 from wsargent/patch-2

Update "Building From Source" to 2.2-SNAPSHOT
Merge pull request #1310 from wsargent/fix-1310

Error with javadoc not finding inner class Field in DynamicForm.java
Merge pull request #1307 from jroper/fix-package

Fix package script for 2.2 milestone release
Use AtomicReference instead of "synchronized"
Oops, mark field as private
Change WS.resetClient to be private to Play
Source formatted via './build scalariform-format'
Merge pull request #1294 from mmorearty/patch-wsclient-racecondition

Fix race condition in WS.client and WS.resetClient