updated to 2.11
updated to 2.11
updated version
updated version
merged from master
reset to 2.10
play 2.2 support #550
play 2.2 support #550
fixed param name
updated readme
Include OSGi headers in the manifest so that the JARs can be used
in a OSGi container such as Eclipse Virgo.

The new headers should not impact non-OSGi usage in any way.
Merge pull request #627 from draghuram/osgi_develop

Include OSGi headers in the manifest.
Merge remote-tracking branch 'upstream/develop' into features/dynamic_fields

Conflicts:
	modules/swagger-play2/app/controllers/ApiHelpController.scala