Merge pull request #326 from codecombat/master

Merging master into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Update pt-BR.coffee

Work in progress.
Merge remote-tracking branch 'cocomaster/master'
update Chinese (simplified)

update ‘…’ to ‘……’
add ‘ ’ before and after for each english in Chinese
add ‘。’ for some value
add translation value for ‘email_notifications_description’
update ‘customize_wizard’
update ‘:’ to ‘：’
update ‘!’ to ‘！’
Add indentation to fix template engine output
Modified python scripts to support both python2.7 and python3 natively
Removed my silly helper server helper script
Merge branch 'master' of github.com:LightAndLight/codecombat
More memory fixes.
More memory fixes.
Merge pull request #359 from codecombat/master

Merge master into production
Merge pull request #349 from cassiocardoso/patch-1

Update pt-BR.coffee
Merge pull request #351 from liyinkan/master

Update Chinese (simplified)
Merge pull request #354 from justin-/fix/diplomat-template

Add indentation to fix template engine output
Fixed a bug with the goals.
Merge branch 'master' of https://github.com/codecombat/codecombat
Finished pt-BR translation.