Add grunt task for updating sprint number. Update to sprint 21.
Merge pull request #2871 from jbalsas/spanish-translation-sprint-20

Spanish strings for sprint 20
Disable two unit tests due to marijnh/CodeMirror#1255. Bug already filed
to track re-enabling them.
Merge pull request #2890 from adobe/pflynn/disable-failing-tests

Disable two unit tests that are failing intermittently due to CM bug
Merge remote-tracking branch 'upstream/master' into tom/fix-issue-1933
Fixing issue with the cmv3 branch merged
Fixing issue with the cmv3 branch merged (again)
Remove unit test's workaround now that CMv3's newer undo batching logic has
fixed #1994.
Disable the cache before every reload
Add check for broken symlinks to existing dev link condition
Merge pull request #2431 from TomMalbran/tom/fix-issue-1933

Fix: Move Line Up/Down collapses inline editor when moving past the start/end
also end drop on ctrl-click on mac
Merge branch 'master' into dangoor/testsplit

Conflicts:
	test/spec/JSUtils-test.js
Merge pull request #2859 from adobe/dangoor/testsplit

Fixes 2747, split unit and integration tests
Changed to use no-focus class
Merge pull request #2801 from mynetx/l10n-es

Update Getting started screenshot, styling for 'es' locale
Update to latest CodeMirror upstream master
- Update SHA to our CodeMirror fork's master, which is now clean with upstream
  (brackets-sprint20 branch in the adobe/CodeMirror2 fork is no longer needed)
- Fix htmlmixed mode to specify parameters for handling mustache/handlebars
  templates, as required by latest CodeMirror
- Reinstate commented-out unit tests from #2887 since the underlying CM bug
  should now be fixed
Merge pull request #2901 from adobe/randy/issue-2860

Also end drop on ctrl-click on mac
Merge pull request #2904 from adobe/nj/sprint-20-cm-update

Update to latest CodeMirror upstream master
Update CONTRIBUTING.md