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'
Change Play 2.1 to Play 2.2 in README.md
add Clever Cloud deployment documentation
Clever Cloud deployment informations update
Clever Cloud add apply evolutions in doc
Clever Cloud add quotes around play evolutions
Clever Cloud add cc presentation
Merge pull request #1321 from wsargent/fix-readme-to-be-2.1

Change Play 2.1 to Play 2.2 in README.md
Clever Cloud typo fix
Clever Cloud link in sidebar
Updated application.conf comments about configuring loggers to match documentation
 #1329 Improved spec compliance with etags

- RFC2616 requires that if an etag is given with the If-None-Match
  header, but doesn't match, then the If-Modified-Since header must be
  ignored.
- This was causing issues specifically when rolling back a deployment.
- Also moved the AssetsSpec out of the integrationtest project and into
  play-integration-test, to make it simpler.
Merge pull request #1329 from jroper/1329-etags-last-modified

If-None-Since and If-Modified-Since interaction not spec compliant
Upgraded to SBT 0.13.0-M2