Update diplomat.jade

added a spanish translator
Merge pull request #1 from codecombat/master

Update
new variable system implemented and refactored a lot of files already.
Merge github.com:codecombat/codecombat
Select dependents when a extant component is selected.
Adding CLAs view.
Merge branch 'master' of https://github.com/codecombat/codecombat
Implement saving lastLevel in database re #627
Improved page title. Fixed Twitter card image.
No email addresses for non-admins on CLA submissions.
Merge pull request #648 from dpen2000/lastLevel

Implement saving lastLevel in database re #627
For #648: Keeping localStorage fallback for played levels temporarily until most have migrated to user property. Fixed #627.
Merge pull request #649 from jayant1992/master

Fixes #641, the list of levels in editor reloads properly upon changing ...
Fix #390

The issue here was configSchema is an attribute within attributes and so revertAttributes and attributes get the same instance of it when clone is used. Later calls to _.equals fail when only configSchema has changed.
Optimizations of markToRevert: Switch to using $.extend instead of _.cloneDeep and only when type is not a "ThangType"
Added facebook friends to the ladder page.
Merge branch 'master' of https://github.com/codecombat/codecombat

Conflicts:
	app/templates/play/ladder/ladder_tab.jade
	app/views/play/ladder/ladder_tab.coffee
Merged conflicts.
Fixed an ever-reloading bug.
I guess we don't edit simulate counts on the client.