sync with develop

Conflicts:
	package.json

Author: benholloway

package.json

@@ -113,7 +113,7 @@
   "devDependencies": {
     "angularity-helloworld-es5": "angularity/angularity-helloworld-es5#ci-build-0.2.0-E",
     "angularity-todo-es5": "angularity/angularity-todo-es5#ci-build-0.2.0-E",
-    "autodocs": "^0.6.5",
+    "autodocs": "^0.6.8",
     "jasmine-diff-matchers": "~2.0.0",
     "jasmine-node": "2.0.0-beta4",
     "jshint-stylish": "^1.0.1",