Add support for percentage based RGB colors to the inline color editor
Updated tinycolor
Add feature. Open line above/below the current line (Ctrl-Enter / Ctrl-Shift-Enter).
Add unit tests for Open Line feature
Improve Open Line feature. Add additional unit tests.
Invert OpenLine shortcuts
Merge branch 'master' of https://github.com/adobe/brackets into openline
Fix OpenLine problem with inline editors.
Fix OpenLine undo history
Add few improvements in OpenLine
Merge upstream updates
Remove the ColorPicker UI changes while still supporting the %RGB(A) format.
Merge master
update grunt watch task
Add a renaming flag so that calling rename again does nothing
Use isInRename instead of the flag
peg npm dependencies. re-enable phantomjs.
No op if currently open and new project are the same
Added syntax highlighting for *.tpl / *.twig files

*.tpl / *.twig files are Smarty / Twig templates and should be treated as HTML files.
Merge branch 'master' into jasonsanjose/grunt-watch