Merge branch 'master' into 1233-local

Conflicts:
	lib/linguist/language.rb
	lib/linguist/languages.yml
	lib/linguist/samples.json

samples/JavaScript/jsbuild.jsb

@@ -0,0 +1,12 @@
+jsb.library('mylibrary', jsb.STATIC_LIBRARY, function(libObject) {
+    libObject.outputName = 'mylibrary';
+    libObject.cflags = [ '-Wall' ];
+    libObject.ldflags = [ '-pthread' ];
+    libObject.includePaths = [ 'src/include' ];
+    libObject.sources = [ 
+        'src/main.cpp',
+        'src/app.cpp'
+    ];
+});
+
+jsb.build();