Merge remote-tracking branch 'origin/gh-pages' into gh-pages

# Conflicts:
#	build/css/codemirror.css
#	build/js/app.js
#	index.html
#	package.json

Author: marcj

app.js

@@ -1,5 +1,5 @@
-var EQ = require('./css-element-queries/src/ElementQueries');
-var ResizeSensor = require('./css-element-queries/src/ResizeSensor');
+var EQ = require('./../css-element-queries-source/src/ElementQueries');
+var ResizeSensor = require('./../css-element-queries-source/src/ResizeSensor');
 var Hammer = require('hammerjs/hammer');
 
 require('codemirror/mode/xml/xml');
@@ -134,7 +134,7 @@ function example4(){
         }
     });
     new ResizeSensor(box, function(){
-        logger.html('Changed to ' + box[0].clientWidth+'px height.');
+        logger.html('Changed to ' + box[0].clientHeight+'px height.');
     });
 }
 

package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "bootstrap": "^3.3.6",
     "codemirror": "^5.11.0",
-    "gulp": "^3.9.1",
+    "gulp": "^3.9.0",
     "gulp-browserify": "^0.5.1",
     "gulp-concat": "^2.6.0",
     "gulp-markdown": "^1.2.0",