Update pt-PT.coffee

Delete lines 747-753 and 775-776.
Corrected a mistake
Worked in scott's comments and got tests working again
Update en.coffee
Did UX changes, added an error and fixed a job profile editing bug
Merge pull request #1330 from Imperadeiro98/master

Update pt-PT.coffee
Removed more counselor stuff.
Merge pull request #1335 from rubenvereecken/settings_patch

Did UX changes, added an error and fixed a job profile editing bug
Merge pull request #1334 from rubenvereecken/name_check_fix

Worked in scott's comments and got tests working again
Merge branch 'master' of https://github.com/codecombat/codecombat
Propagated i18n. Added password repeat to base en.coffee.
Minor adjustment to the aoe script
Merge pull request #1336 from nemoyatpeace/patch-3

Minor adjustment to the aoe script
Add approved date to job profile
Merge pull request #1337 from codecombat/master

Master into production