Merge branch 'master' into gitlaura-remove-cloud-friend

Author: gitlaura

package.json

@@ -50,7 +50,7 @@
     "grunt-contrib-uglify": "^0.10.1",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-jasmine-chromeapp": "git://github.com/uproxy/grunt-jasmine-chromeapp",
-    "grunt-jasmine-firefoxaddon": "^0.3.3",
+    "grunt-jasmine-firefoxaddon": "0.3.3",
     "grunt-template-jasmine-istanbul": "^0.4.0",
     "grunt-ts": "^5.3.2",
     "grunt-tslint": "^3.0.1",