Merge branch 'develop'

Conflicts:
	bower.json

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"]);
 

LICENSE.md

@@ -30,3 +30,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 This license could be edited in any moment without alert.
+
+Here are listed the authorized individuals and companies and the specific of their licenses:
+
+- **A*Star Education Ltd**: unlimited usage for websites and webapplications of the company.

bower.json

@@ -1,14 +1,16 @@
 {
   "name": "Material Design for Bootstrap",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "homepage": "http://fezvrasta.github.io/bootstrap-material-design",
   "authors": [
     "Federico Zivolo <info@mywebexpression.com>"
   ],
   "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",