Merge github.com:codecombat/codecombat
Merge github.com:glendc/codecombat