Merge branch 'hotfix-0.5.2' into develop

Conflicts:
	image_creator/version.py
	version

diff --cc image_creator/version.py
index 70100ec,f9e59b8..3158b73
--- 1/image_creator/version.py
--- 2/image_creator/version.py
+++ b/image_creator/version.py
@@@ -1,7 -1,8 +1,8 @@@
- __version__ = "0.5.1next"
- __version_info__ = ['0', '5', '1next']
+ 
 -__version__ = "0.5.2"
++__version__ = "0.5.2next"
  __version_vcs_info__ = {
 -    'branch': 'hotfix-0.5.2',
 -    'revid': '97a59b7',
 -    'revno': 397}
 +    'branch': 'develop',
-     'revid': '7b93cb7',
-     'revno': 395}
- __version_user_info__ = "skalkoto@darkstar.admin.grnet.gr"
++    'revid': '694ca1e',
++    'revno': 396}
+ __version_user_email__ = "skalkoto@grnet.gr"
+ __version_user_name__ = "Nikos Skalkotos"

diff --cc version
index 57cbc6c,cb0c939..26ab8ec
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- 0.5.1next
 -0.5.2
++0.5.2next