Merge branch 'release/2.5.0'

Author: Joshua27

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.4.0
+current_version = 2.5.0
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>\w+))?
 commit = True
 tag = False

Makefile

@@ -1,7 +1,7 @@
-MODEL_GENERATOR_VERSION=4.6.0
+MODEL_GENERATOR_VERSION=4.7.0
 modelgenerator=bin/modelgenerator-$(MODEL_GENERATOR_VERSION).jar
 
-MINCER_VERSION=2.2.0
+MINCER_VERSION=2.3.0
 mincer=bin/mincer-$(MINCER_VERSION).jar
 
 # Available flavors for data

VERSION

@@ -1 +1 @@
-2.4.0
+2.5.0