Fix warnings
Fix occurrence and inactive code highlighting in CDT
Mapping file for Geppetto's Puppet DSL Editor
Fixed some indentation in plugin.xml.
Merge pull request #122 from askreet/master

Added mapping file for Geppetto's Puppet DSL Editor
Update CHANGES
added twig mapping, refs #88
added yaml mapping
added support for json plugin
Add support for the xtend editor (http://eclipse.org/xtend/).
Merge pull request #130 from pulse00/twig

added twig mapping, refs #88
Update CHANGES
Fix a typo
Merge branch 'pulse00-json'

Conflicts:
	com.github.eclipsecolortheme/plugin.xml
Update README and CHANGES
Merge branch 'pulse00-yaml'

Conflicts:
	com.github.eclipsecolortheme/plugin.xml
Update README and CHANGES
Merge branch 'ghillairet-master'

Conflicts:
	com.github.eclipsecolortheme/plugin.xml
Update README and CHANGES
Merged with 1.3.0