Updating changelog

CHANGELOG.md

 Upcoming version:
 -----------------
   - moving gradle changelog tasks to separate buildscript (Nikolaus Krismer)
+
+Version v0.5.1:
+---------------
   - fixing problems in changelog generation (again) (Nikolaus Krismer)
+  - Merge branch 'master' of git@dbis-git.uibk.ac.at:krismer/isochrone-vm.git (Nikolaus Krismer)
   - calling grgit add before grgit commit (by now push is empty) (Nikolaus Krismer)
   - not commiting changelogs in jenkins without changes :-) (Nikolaus Krismer)
   - improving gradle changelog mechanism (excluding jenkins commits) (Nikolaus Krismer)
@@ -12,9 +16,6 @@ Upcoming version:
   - fixing problems with gradle's clean task (Nikolaus Krismer)
   - fixing invalid clean task definition (Nikolaus Krismer)
   - adding removal of CHANGELOG to clean task (Nikolaus Krismer)
-
-Version v0.5.1:
----------------
   - removed hard-coded version from gradle (is set using scmversion plugin) (Nikolaus Krismer)
   - added density generation for synthethic networks (Nikolaus Krismer)
   - removed pgRouting / osm2pgrouting from files (not needed and never used) (Nikolaus Krismer)
@@ -39,6 +40,7 @@ Version v0.5.0:
   - geoserver version update (Nikolaus Krismer)
   - always adding pg_procedures to created database (not only when postgis is installed) (Nikolaus Krismer)
   - added installation of phpLiteAdmin and spatialite (Nikolaus Krismer)
+  - Merge branch 'master' of git@dbis-git.uibk.ac.at:krismer/isochrone-vm.git (Nikolaus Krismer)
   - source profile in init script so it works without problems in centos 6 with the service command (Nikolaus Krismer)
   - Fixed tomcat startup message (root)
   - creating directories needed by script at the beginning (Nikolaus Krismer)