Merge remote-tracking branch 'origin/master' into 0.5.6-no-jsdom

* origin/master:
  #182: fix npm 2
  add 0.5.6 to updates section
  bump to 0.5.6

# Conflicts:
#	package.json

Gruntfile.js

@@ -1,20 +1,25 @@
 'use strict';
 var path = require('path');
+var fs = require('fs');
 
 var pathToApp = path.resolve('./');
-var parentFolderName = path.basename(path.resolve('..'));
 global.pathToApp = pathToApp;
 
 var loadOptions = require('./core/loadOptions');
 
+// NPM 3 compatibility fix
 var getLoaderPackageName = function() {
     var packageName;
+    var parentFolderName = path.basename(path.resolve('..'));
     var isSubPackage = parentFolderName === 'node_modules';
-    if (isSubPackage) {
+    var isLocalDepsAvailable = fs.existsSync('node_modules/grunt-autoprefixer') && fs.existsSync('node_modules/grunt-contrib-cssmin');
+
+    if (isSubPackage && !isLocalDepsAvailable) {
         packageName = 'load-grunt-parent-tasks';
     } else {
         packageName = 'load-grunt-tasks';
     }
+
     return packageName;
 };
 

README.md

@@ -52,6 +52,7 @@ If you notice some bugs, or need to help finding a better solution in your proce
 [Materials for presentations](https://github.com/sourcejs/pres).
 
 ## Updates
+* 20.09.15 [0.5.6](https://github.com/sourcejs/Source/releases/tag/0.5.6) and  [0.5.6-no-jsdom](https://github.com/sourcejs/Source/releases/tag/0.5.6-no-jsdom) with EJS helpers, NPM 3 support and navigation improvements
 * 16.08.15 [0.5.5](https://github.com/sourcejs/Source/releases/tag/0.5.5) and  [0.5.5-no-jsdom](https://github.com/sourcejs/Source/releases/tag/0.5.5-no-jsdom) patch release with `<markdown>` tag fix and set of functional tests
 * 15.08.15 [0.5.4](https://github.com/sourcejs/Source/releases/tag/0.5.4) and  [0.5.4-no-jsdom](https://github.com/sourcejs/Source/releases/tag/0.5.4-no-jsdom) with middleware loader, relative paths in navigation support and other improvements
 * 28.05.15 [0.5.3](https://github.com/sourcejs/Source/releases/tag/0.5.3) context options support, source-as-npm package, CI integration, watcher stability improvements and other great features