unit test for embedded styles in inline editor
add unit test for finding embedded style blocks
merge conflict
Use templates instead of jQuery in the Debug Commands extension
Include requirejs, text, and i18n as submodules
Include Folders?
Move some extensions strings and commands to the bottom of the file with an extension comment.
Add localized CC and Adobe URLs. Fix broken HTML in WEB_PLATFORM_DOCS french translation from last lockit.
Manually fix Japanese string and add URLs
fix copyright date
Visual tweaks for the quick open drop-down.
add full version to build.prop file
omit skipped suites and specs from the JUnit report
fix jshint errors
Merge branch 'master' of https://github.com/adobe/brackets into larz/quick-open-tweaks
Updated branch based on NJ's feedback
Merge branch 'master' of https://github.com/adobe/brackets into larz/quick-open-tweaks
Updated based on @peterflynn's feedback.
Merge branch 'master' into jasonsanjose/cc-license

Conflicts:
	src/nls/fr/strings.js
Merge branch 'master' of https://github.com/adobe/brackets into larz/quick-open-tweaks