Merge branch 'origin/1.1dev'

Conflicts:
	dist/webvs.full.min.js
	dist/webvs.min.js

README.md

@@ -24,7 +24,7 @@ Webvs uses grunt for build and bower for dependencies. Run the following command
 
 To build the code run `grunt` or `grunt dist`. This generates `webvs.js` and `libs.js` in the `build` directory or the minified files in the `dist` directory respectively.
 
-To run the tests, use `grunt test` command. To debug the code/examples, run `grunt debug`. This runs a webserver at 8080 and a live re-build of the source files.
+To run the tests, use `grunt test` command. To debug the code/examples, run `grunt debug`. This runs a webserver at 8000 and a live re-build of the source files.
 To debug tests, run `grunt debug_test`. This is same as `grunt debug` but also runs karma test server and opens up the test page where you can do debugging with 
 the browser code inspector.
 

karma.conf.js

@@ -12,6 +12,7 @@ module.exports = function(config) {
         files: [
             "build/libs.js",
             "build/webvs.js",
+            "test/webgl-debug.js",
             "test/base.js",
             "test/*.test.js"
         ],

src/Base.js

@@ -48,7 +48,7 @@ Webvs.checkRequiredOptions = function(options, requiredOptions) {
     for(var i in requiredOptions) {
         var key =  requiredOptions[i];
         if(!(key in options)) {
-            throw new Error("Required option " + key + "not found");
+            throw new Error("Required option " + key + " not found");
         }
     }
 };
@@ -183,7 +183,7 @@ Webvs.Promise = Webvs.defineClass(Promise, Object, {
  */
 Webvs.joinPromises = function(promises) {
     var joinedPromise = new Promise();
-
+    promises = _.filter(promises, function(p) {return !_.isUndefined(p);});
     if(promises.length === 0) {
         joinedPromise.resolve();
     } else {
@@ -262,4 +262,12 @@ Webvs.clamp = function(num, min, max) {
   return Math.min(Math.max(num, min), max);
 };
 
+Webvs.getComponentClass = function(name) {
+    var componentClass = Webvs[name];
+    if(!componentClass) {
+        throw new Error("Unknown Component class " + name);
+    }
+    return componentClass;
+};
+
 })(window);