Merge branch '2.0.X' into 2.1.X

Author: nmccready

grunt/options.coffee

@@ -1,6 +1,14 @@
 log = require('util').log
 jasmineSettings = require './jasmine'
 _ = require 'lodash'
+_pkg = require '../package.json'
+
+_pkg.nextVersion = do ->
+    # note this will fail on new minor or major releases.. oh well manually fix it
+    # for now as this is mainly for changelog
+    last = _.last _pkg.version.split('.')
+    next = Number(last) + 1
+    _pkg.version.replace(last, String(next))
 
 pipeline = [
   "src/coffee/module"
@@ -132,7 +140,7 @@ module.exports = (grunt) ->
         tag: false
         push: false
         pushTags: false
-    pkg: grunt.file.readJSON("package.json")
+    pkg: _pkg
     pkgFn: ->
       grunt.file.readJSON("package.json") #always get latest!
     clean:
@@ -300,7 +308,8 @@ module.exports = (grunt) ->
           filename: "webpack.[name].js",
 
     changelog:
-        options:{}
+        options:
+            version: _pkg.nextVersion
 
     angular_architecture_graph:
             diagram: