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 World entities individually.
Better, more generic Server header
Fix sbt and database issues with scruffy
Add hamiltont's suggestions
Fix minor bug in the installation process for stream causing it to fail on travis
Merge remote-tracking branch 'upstream/master'
Updated /update test in relation to this comment: https://github.com/TechEmpower/FrameworkBenchmarks/pull/1166#discussion_r19762334
Merge pull request #1210 from TechEmpower/fix-stream

Fix minor bug in the installation process for stream causing it to fail on travis
Merge pull request #1166 from donovanmuller/master

Updated all benchmarks to Play 2.3.6 and Scala 2.11.4.
Python 3.4 installs pip automatically

`get-pip` is not required anymore.
Trying to fix a bug with benchmarking
Fixed up update as well
Merge pull request #1217 from TechEmpower/fixBenchmarks

Fix benchmarks
Revert hamiltont's suggestions
added Helper class from undertow-edge project. Now using one method for request parameter validation/normalisation and ThreadLocalRandom for the random number generation See:TechEmpower/FrameworkBenchmarks#1152
Removed old unused test
returning single object for /db when only one query was executed