Fixed the play frameworks to specify play2
Merge branch 'master' of github.com:TechEmpower/FrameworkBenchmarks
Changed the high-level framework back.

This ended up causing name collisions when running the tests.
Merge remote-tracking branch 'upstream/master'