Merge pull request #511 from codecombat/master

Merge master into production
Merge pull request #514 from codecombat/master

Merge database/ladder fixes into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge pull request #1 from codecombat/master

test request
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge pull request #528 from codecombat/master

Merge master into production
Merge pull request #533 from codecombat/master

Master into production
Merge branch 'master' into production
Merge pull request #542 from codecombat/master

Master into production
Merge pull request #544 from codecombat/master

Master into production
Merge pull request #549 from codecombat/master

Master into production
Merge pull request #551 from codecombat/master

Hotfix for #550
Merge pull request #552 from codecombat/master

Another hot fix for #550
Merge branch 'master' into production
Merge pull request #557 from codecombat/master

Master into production
Merge pull request #559 from codecombat/master

Changed response for count API
added select statement for programming language