Merge branch 'stable' into develop

spec/javascripts/support/jasmine.yml

@@ -40,7 +40,7 @@ stylesheets:
 #   - helpers/**/*.jsview
 #
 helpers:
-  - helpers/**/*.js
+  - jasmine_helpers/**/*.js
 
 # spec_files
 #

spec/javascripts/widgets/aspect-nav.js

@@ -1,9 +0,0 @@
-describe("Diaspora", function() {
-  describe("widgets", function() {
-    describe("aspectNav", function() {
-      describe("start", function() {
-
-      });
-    });
-  });
-});