Merge branch 'master' of https://github.com/codecombat/codecombat
Merge branch 'master' of https://github.com/M-r-A/codecombat