"Hello, world" -> "Hello, World!"
Merge branch 'evhttp-sharp' of https://github.com/kekekeks/FrameworkBenchmarks into 828
Merge branch 'master' of https://github.com/TechEmpower/FrameworkBenchmarks
set the right version of PHP for Composer
format cpanfile and add --notest to cpanm
Merge remote-tracking branch 'upstream/master'
fix for issue #786 plus minor improvement to Dispatcher
827 issue resolved

Contributor caught a missing single quote,
issue was already resolved in previous commits.

Conflicts:
	config/benchmark_profile
Merge branch '726-express-mysql-validation' of https://github.com/avaly/FrameworkBenchmarks into 777
Merge branch '828'
777 added charset parameter

app.js file was missing a charset parameter
that allowed the Japanese characters to be rendered
properly.
Merge branch '777'
Merge pull request #786 from jasonhinkle/master

Phreeze fix for query test warnings and fortunes test fail
update to Grails 2.4.1
Grails: improved fix to issue #658, remove all transactions
fix connector for  #812
Merge branch 'master' of https://github.com/yogthos/FrameworkBenchmarks into 848
Merge branch 'slick2-upgrade' of https://github.com/cvogt/FrameworkBenchmarks into 824
Use 3.2.8 insetead of 3.4.0
Merge branch 'master' of https://github.com/TechEmpower/FrameworkBenchmarks