comment out use of defaultExtension pref to avoid problems with ScopeManager
Merge remote-tracking branch 'origin/master' into bchin/disable-defaultExtension-pref
Merge pull request #6543 from adobe/bchin/disable-defaultExtension-pref

disable defaultExtension pref, for issue #6539
Fix for #6541 that leaves preferences in place after conversion.

When you switch to Brackets 36, preferences will be converted automatically.
If you switch back to an earlier Brackets, your old preferences will still
be there. Any changes you make in that earlier Brackets will not be re-converted
to 36-style preferences.
use separate var names for convertedKeys & convertedKeysMap
Merge pull request #6550 from adobe/dangoor/6541-leave-prefs

Fix for #6541 that leaves preferences in place after conversion.
Start loading project preferences as soon as possible.

This is not a 100% fix for #6555 but it does eliminate the flash of JSLint
Errors in my testing.
Updated by ALF automation.
Merge pull request #6560 from adobe/alf_localization

ALF Automation
force new files to be created in the current project if the selection is outside the project
jsdoc typo
Merge pull request #6561 from adobe/jasonsanjose/issue-6544

New file should fallback to the project root if the current file is outside the project
revert pull request #6380 which fixed issue #5507 but caused issue #6552
Merge pull request #6564 from adobe/bchin/issue-6552

Fix issue #6552- "Renderring issue in Result panel after renaming a file in the project tree." (but reopen #5507 & part of #6238)
Merge pull request #6557 from adobe/dangoor/6555-FOJE

Start loading project preferences as soon as possible.