Merge pull request #4983 from adobe/dangoor/4948-tag-change2

Fix for 4948: changing tags (based on master)
grunt set-sprint --sprint=31
Update index.html
Fixed an out-of-scope variable error

Silly me.
Merge pull request #4999 from morozd/patch-1

Update Russian index.html
Create urls.js
Merge branch 'master' of https://github.com/adobe/brackets into larz/twipsy
Added comments based on Randy's feedback.
Merge branch 'larz/twipsy' of https://github.com/adobe/brackets into larz/twipsy
update codemirror
Merge pull request #4915 from adobe/larz/twipsy

Tweaked Twipsy.
style cleanup for navigation buttons
Merge pull request #4962 from adobe/jasonsanjose/issue-4564

Use CodeMirror setSize() instead of $.height() for editor resize
Merge pull request #4974 from adobe/iwehrman/tab-size-spaces-colon

Add a colon after the 'Tab Size' and 'Spaces' in the status bar
Cache mark locations during a single run of the parser
Update NOTICE
performance: delay first, then scan page
Updated by ALF automation.
Make tokenizer emit line/ch positions as well as offsets (not used by parser yet)
Use positions from tokenizer in parser. Mostly working but one unit test is failing.