Merge branch 'master' into develop

Conflicts:
	image_creator/version.py
	version

diff --cc image_creator/version.py
index 9fa443e,b90d3a7..bc172ff
--- 1/image_creator/version.py
--- 2/image_creator/version.py
+++ b/image_creator/version.py
@@@ -1,8 -1,8 +1,7 @@@
--
- __version__ = "0.6next"
 -__version__ = "0.6.1"
++__version__ = "0.6.1next"
  __version_vcs_info__ = {
-     'branch': 'develop',
-     'revid': '94db968',
-     'revno': 427}
+     'branch': 'master',
+     'revid': '280a0e5',
+     'revno': 430}
  __version_user_email__ = "skalkoto@grnet.gr"
  __version_user_name__ = "Nikos Skalkotos"

diff --cc version
index 4f3767f,ee6cdce..535e5d0
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- 0.6next
 -0.6.1
++0.6.1next