Merge branch 'grunt-conventional-changelog-support' of https://github.com/PascalPrecht/angularFire into PascalPrecht-grunt-conventional-changelog-support

Conflicts:
	Gruntfile.js
	package.json

Author: anantn

Gruntfile.js

@@ -62,6 +62,7 @@ module.exports = function(grunt) {
         }
       }
     },
+
     karma: {
       unit: {
         configFile: 'tests/automatic_karma.conf.js'
@@ -71,6 +72,12 @@ module.exports = function(grunt) {
         singleRun: true,
         browsers: ['PhantomJS']
       }
+    },
+
+    changelog: {
+      options: {
+        dest: 'CHANGELOG.md'
+      }
     }
   });
 

package.json

@@ -18,6 +18,7 @@
     "grunt-contrib-jshint": "~0.6.2",
     "grunt-karma": "~0.6.2",
     "grunt-exec": "~0.4.2",
+    "grunt-conventional-changelog": "~1.0.0",
     "load-grunt-tasks": "~0.2.0",
     "karma-jasmine": "~0.1.3",
     "karma-script-launcher": "~0.1.0",