Merge branch 'master' into trevj-version-bump

Author: trevj

Gruntfile.coffee

@@ -1300,14 +1300,15 @@ taskManager.add 'test', [
 ]
 
 # Builds all code, including the "dist" build, but skips
-# linging and testing which can both be annoying and slow.
+# linting and testing which can both be annoying and slow.
 # jshint is here because catches hard syntax errors, etc.
 taskManager.add 'build', [
   'exec:rmIosBuild'
   'exec:rmAndroidBuild'
   'build_chrome'
   'build_firefox'
   'build_cca'
+  'samples'
   'jshint'
   'copy:dist'
   'jpm:xpi'