Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR...

Conflicts:
	package.json

diff --cc Gruntfile.js
Simple merge

diff --cc package.json
index 8bcd4840ef7d5f881fec2f071490a3cece808478,1a7fdf465f434208c00bfa76504eb4c69048b97f..14d42ab7ee390523054484a7d797e48621a8b038
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -33,7 -33,7 +33,8 @@@
      "grunt-contrib-connect": "~0.6.0",
      "grunt-contrib-copy": "~0.5.0",
      "grunt-contrib-csslint": "~0.2.0",
+     "grunt-contrib-cssmin": "~0.7.0",
 +    "grunt-contrib-jade": "~0.9.1",
      "grunt-contrib-jshint": "~0.8.0",
      "grunt-contrib-less": "~0.9.0",
      "grunt-contrib-qunit": "~0.3.0",