Set Solarized Dark colors for JSP
Merge branch 'master' of github.com:ostewart/intellij-colors-solarized

Conflicts:
	Solarized Dark.xml
	settings.jar
Make Scala type coloring more consistent

* Swap class and keyword colors and embolden keywords
* This makes the Scala scheme divergent from Java (in class and keyword
  coloring), but more internally consistent. For example, the same class names
  were frequently being highlighted differently in different contexts, and
  there didn't seem to be any scheme behind related coloring.  Now, classes
  and traits are yellow, predefined classes are orange, and objects are gray
  (since they are instances, so colored more like instance variables...I
  could see using a similar color to classes/traits/predefined classes, but
  we've run out of colors and this seems better in practice than having no
  distinction from classes).
* This essentially reverts some of bd547512b182dfa176c581e5ba2d9c3d50b384fb
  while preserving the cleanup
* The original Scala coloring was derived more from the examples of Ruby
  in the Solarized documentation than from Java, since the former seemed to have
  gotten a lot more attention, and Scala seems closer to Ruby than to Java
  in aesthetics.  Also the Java example barely seems to be colored at all,
  so I wanted to take better advantage of Solarized for Scala.  This commit
  returns some of the coloring to the Ruby style, which also makes it more
  consistent with the examples showcased in the Solarized documentation.
Updated Scala coloring for Solarized Light

This is the same change made for Solarized Dark
in 1cbfb91ecd8db4b99d6cf3a67816f75cbd8a627f by
ostewart
Added color for Scala XML Text
Set gutter colors for added/modified lines

Fixes #45
Change VCS annotation colors for Solarized Dark

Fixes #47
fixed coffeescript support for Solarized Dark
copy to both icls and xml formats
bash support for Solarized Dark
Merge pull request #50 from mente/coffee-dark

fixed coffeescript support for Solarized Dark
Merge pull request #51 from mente/icls-support

copy to both icls and xml formats
Merge pull request #52 from mente/bash-dark

bash support for Solarized Dark
Updated settings.jar
fix heredoc content in php
Fix Markdown backgrounds in Solarized Dark
Updated settings.jar
Merge pull request #54 from mente/heredoc-php

fix heredoc content in php
Merge pull request #55 from wmono/master

Fix Markdown backgrounds in Solarized Dark
Updated settings.jar after the latest merges