Cutting 2.10.15 release
Merge pull request #1130 from github/2.10.15-release

Cutting 2.10.15 release
Updating JS colour to be a little softer
Merge pull request #1135 from github/js-colour-update

Updating JS colour to be a little softer
Added samples for Haskell
New sample file for R
Gave GML a colour (its official colour)
Change DOT language type from programming to data (fix #1145)

DOT language is a (graph) description language thus a subset of a data
language.
Update PHP colour to reflect php.net

Currently the PHP colour is very similar to C#, and seems to have been pull from thin air. PHP has a perfectly nice distinctive purple, used on [php.net](http://php.net) since forever. This pull request changes PHP's colour to a dark shade of that purple.

Before                                   | After
-----------------------------------------|-----------------------------------------
![](http://www.colorhexa.com/6e03c1.png) | ![](http://www.colorhexa.com/4f5d95.png)
Merge pull request #1144 from TazeTSchnitzel/patch-1

Gave GML a colour (its official colour)
Merge pull request #1156 from quarterto/patch-1

Update PHP colour to reflect php.net
Merge pull request #1141 from killmous/master

Added samples for Haskell
Samples update
Merge branch 'master' into 1142

Conflicts:
	lib/linguist/samples.json
Merge pull request #1158 from github/1142-update

1142 update
Merge pull request #1146 from Rolinh/master

Change DOT language type from programming to data (fix #1145)
Support of the BitBake language