Merge branch 'develop'

Conflicts:
	dist/css/material-wfont.css
	dist/css/material-wfont.min.css
	dist/css/material.css
	dist/css/material.min.css
	less/material.less
	template/material/css/material-wfont.css
	template/material/css/material-wfont.min.css
	template/material/css/material.css
	template/material/css/material.min.css

Author: FezVrasta

Gruntfile.js

@@ -18,6 +18,13 @@ module.exports = function(grunt) {
             }
         },
 
+        githooks: {
+            all: {
+                // Will run the jshint and test:unit tasks at every commit
+                "pre-commit": "less autoprefixer cssmin uglify copy newer:jshint jasmine:scripts"
+            }
+        },
+
         sass: {
             compilesass: {
                 files: {
@@ -170,7 +177,7 @@ module.exports = function(grunt) {
 
     });
 
-    grunt.registerTask("default", ["less", "autoprefixer", "cssmin", "uglify", "copy"]);
+    grunt.registerTask("default", ["githooks", "less", "autoprefixer", "cssmin", "uglify", "copy"]);
 
     grunt.registerTask("scss", ["sass", "autoprefixer", "cssmin", "uglify", "copy"]);
 

bower.json

@@ -8,7 +8,9 @@
   "description": "Material Design theme for Bootstrap 3",
   "main": [
     "dist/css/material.css",
-    "dist/js/material.js"
+    "dist/js/material.js",
+    "dist/css/ripples.css",
+    "dist/js/ripples.js"
   ],
   "ignore": [
     "test",