Clean up mixed quotes
Merge master into branch
Merged conflicts.
Merged conflicts.
Merge branch 'kumabotz-cleanup-mixed-quotes'
Merge branch 'master' of https://github.com/codecombat/codecombat