Fix changelog and version after merge with public master

CHANGELOG.md

@@ -10,6 +10,13 @@
 * Added unit and integration tests
 * Preview of the new AngularJS front-end
 
+## Version 0.10.2
+
+* Documentation updates
+* Log management bug fixes
+* Fix a bug with the scheduler time trigger
+* Sort by ID when listing execution from the command-line client
+
 ## Version 0.10.1
 
 * Service discovery API endpoint: simple, read-only, unauthenticated access to a list of DNS names of services. Needed for frameworks that need a list of hosts for configuration, can be used by scripts in the images.

zoe_lib/version.py

@@ -15,6 +15,6 @@
 
 """Versions."""
 
-ZOE_VERSION = '0.12-kpmg'
+ZOE_VERSION = '2017.03'
 ZOE_API_VERSION = '0.7'
 ZOE_APPLICATION_FORMAT_VERSION = 2