Merge branch 'master' of ssh://giccero.cloud.ik.bme.hu/cloud Conflicts: miscellaneous/store-server/CloudStore.py
