dropwizard/plaintext now returns precomputed byte array
Merge remote-tracking branch 'upstream/master' into dropwizard-plaintext
Added changes from Dropwizard/DWMongo pre-test-change
Merge remote-tracking branch 'upstream/master'
Fixed /update route so tests can pass
Updated all benchmarks to Play 2.3.6 and Scala 2.11.4.
Updated Ebean benchmarks to include missing tests as well as include HikariCP version.
Moved `/plaintext` tests from JPA/Ebean benchmarks to the `play2-java` benchmark as per https://github.com/TechEmpower/FrameworkBenchmarks/pull/1149#dis
Added BoneCP qualifier as per https://github.com/TechEmpower/FrameworkBenchmarks/pull/1149#discussion_r19584629 and changed names accordingly.
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	frameworks/Java/play2-java/benchmark_config
	frameworks/Java/play2-java/generate_config.py
	frameworks/Java/play2-java/play2-java-ebean-hikaricp/source_code
	frameworks/Java/play2-java/play2-java-jpa-bonecp/app/controllers/Application.java
	frameworks/Java/play2-java/play2-java-jpa-bonecp/conf/routes
	frameworks/Java/play2-java/play2-java-jpa-hikaricp/README.md
	frameworks/Java/play2-java/play2-java-jpa-hikaricp/app/controllers/Application.java
	frameworks/Java/play2-java/play2-java-jpa-hikaricp/build.sbt
	frameworks/Java/play2-java/play2-java-jpa-hikaricp/conf/application.conf
	frameworks/Java/play2-java/play2-java-jpa-hikaricp/conf/routes
	frameworks/Java/play2-java/play2-java-jpa/README.md
	frameworks/Java/play2-java/play2-java-jpa/app/models/World.java
Fixed project name
Update Nimrod to 0.10.0
Compile Nawak and Jester with nim instead of nimrod
Update World entities individually.
Better, more generic Server header
Fix dependencies order for jester and nawak
Merge pull request #1162 from ebramanti-techempower/master

Fix Dropwizard/Dropwizard Mongo tests
Fixed a bug with the restructure for Treefrog
Fixed the issue about foo/0/501

This new implementation allows for a maximum infraction
level to be set when calling _verifyQueryList, and this
is set to 'fail' by default, but overridden with 'warn'
for these tests
Merge pull request #1168 from TechEmpower/1167

Fixed the issue about foo/0/501
Merge branch 'master' into fixTreefrog
Nawak: limit number of workers for Travis

The number of postgresql connections available are currently limited with Travis.
Avoids hitting the "remaining connection slots are reserved for
non-replication superuser connections" error.
Nawak: fix number of workers in the command line